管理基本完成

common/src/main/java/com/jpsoft/machinery/modules/common/dto/QueryListDTO.java

@@ -0,0 +1,23 @@
+package com.jpsoft.machinery.modules.common.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+  描述:base_commodity的实体类
+ */
+@Data
+@ApiModel(value = "下拉菜单的实体类")
+public class QueryListDTO {
+    @ApiModelProperty(value = "编号")
+    private String id;
+    @ApiModelProperty(value = "名称")
+    private String name;
+    @ApiModelProperty(value = "父级")
+    private String parentId;
+}

web/src/main/java/com/jpsoft/machinery/config/SwaggerConfig.java

@@ -22,7 +22,7 @@ public class SwaggerConfig {
         return new Docket(DocumentationType.SWAGGER_2)
                 .apiInfo(apiInfo())
                 .select()
-                .apis(RequestHandlerSelectors.basePackage("com.jpsoft.supervision"))
+                .apis(RequestHandlerSelectors.basePackage("com.jpsoft.machinery"))
                 .paths(PathSelectors.any())
                 .build()
                 //添加登录认证

web/src/main/java/com/jpsoft/machinery/modules/base/controller/CommodityController.java

@@ -0,0 +1,236 @@
+package com.jpsoft.machinery.modules.base.controller;
+
+import com.github.pagehelper.Page;
+import com.jpsoft.machinery.modules.base.entity.Catalogues;
+import com.jpsoft.machinery.modules.base.service.CataloguesService;
+import com.jpsoft.machinery.modules.common.utils.PojoUtils;
+import com.jpsoft.machinery.modules.common.dto.Sort;
+import com.jpsoft.machinery.modules.common.dto.MessageResult;
+import com.jpsoft.machinery.modules.base.entity.Commodity;
+import com.jpsoft.machinery.modules.base.service.CommodityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@RestController
+@RequestMapping("/base/commodity")
+@Api(description = "commodity")
+public class CommodityController {
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    @Autowired
+    private CommodityService commodityService;
+    @Autowired
+    private CataloguesService cataloguesService;
+
+    @ApiOperation(value="创建空记录")
+    @GetMapping("create")
+    public MessageResult<Commodity> create(){
+        MessageResult<Commodity> msgResult = new MessageResult<>();
+
+        Commodity commodity = new Commodity();
+
+        msgResult.setData(commodity);
+        msgResult.setResult(true);
+
+        return msgResult;
+    }
+    
+    @ApiOperation(value="添加信息")
+    @PostMapping("add")
+    public MessageResult<Commodity> add(@RequestBody Commodity commodity,@RequestAttribute String subject){
+        MessageResult<Commodity> msgResult = new MessageResult<>();
+
+        try {
+            commodity.setId(UUID.randomUUID().toString());
+            commodity.setDelFlag(false);
+            commodity.setCreateBy(subject);
+            commodity.setCreateTime(new Date());
+            
+            int affectCount = commodityService.insert(commodity);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(commodity);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库添加失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="获取信息")
+    @GetMapping("edit/{id}")
+    public MessageResult<Commodity> edit(@PathVariable("id") String id){
+        MessageResult<Commodity> msgResult = new MessageResult<>();
+
+        try {
+            Commodity commodity = commodityService.get(id);
+
+            if (commodity != null) {
+                msgResult.setResult(true);
+                msgResult.setData(commodity);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库不存在该记录!");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="更新用户")
+    @PostMapping("update")
+    public MessageResult<Commodity> update(@RequestBody Commodity commodity,@RequestAttribute String subject){
+        MessageResult<Commodity> msgResult = new MessageResult<>();
+
+        try {
+            commodity.setUpdateBy(subject);
+            commodity.setUpdateTime(new Date());
+            
+            int affectCount = commodityService.update(commodity);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(commodity);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("数据库更新失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+	@ApiOperation(value="删除")
+    @PostMapping("delete/{id}")
+    public MessageResult<Integer> delete(@PathVariable("id") String id,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            Commodity commodity = commodityService.get(id);
+            commodity.setDelFlag(true);
+            commodity.setUpdateBy(subject);
+            commodity.setUpdateTime(new Date());
+
+            int affectCount = commodityService.update(commodity);
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+
+    @ApiOperation(value="批量删除")
+    @PostMapping("batchDelete")
+    public MessageResult<Integer> batchDelete(@RequestBody List<String> idList,@RequestAttribute String subject){
+        MessageResult<Integer> msgResult = new MessageResult<>();
+
+        try {
+            int affectCount = 0;
+
+            for (String id : idList) {
+                Commodity commodity = commodityService.get(id);
+                commodity.setDelFlag(true);
+                commodity.setUpdateBy(subject);
+                commodity.setUpdateTime(new Date());
+
+                affectCount += commodityService.update(commodity);
+            }
+
+            if (affectCount > 0) {
+                msgResult.setResult(true);
+                msgResult.setData(affectCount);
+            } else {
+                msgResult.setResult(false);
+                msgResult.setMessage("删除失败");
+            }
+        }
+        catch(Exception ex){
+            logger.error(ex.getMessage(),ex);
+
+            msgResult.setResult(false);
+            msgResult.setMessage(ex.getMessage());
+        }
+
+        return msgResult;
+    }
+
+    @ApiOperation(value="列表")
+    @RequestMapping(value = "pageList",method = RequestMethod.POST)
+    public MessageResult<Map> pageList(
+            String cataloguesId, String productModel,
+            @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
+            @RequestParam(value="pageSize",defaultValue="20") int pageSize,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+
+        List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("id_","asc"));
+
+        if (StringUtils.isNotEmpty(cataloguesId)) {
+            searchParams.put("cataloguesId",cataloguesId);
+        }
+        if (StringUtils.isNotEmpty(productModel)) {
+            searchParams.put("productModel","%" + productModel + "%");
+        }
+
+        Page<Commodity> page = commodityService.pageSearch(searchParams,pageIndex,pageSize,true,sortList);
+        for(Commodity commodity : page.getResult()){
+            Catalogues catalogues = cataloguesService.get(commodity.getCataloguesId());
+            commodity.setCataloguesName(catalogues.getTitle());
+        }
+
+        msgResult.setResult(true);
+        msgResult.setData(PojoUtils.pageWrapper(page));
+
+        return msgResult;
+    }
+}