矿山域-矿料管理

business-modules/business-mine/src/main/java/com/sckw/mine/controller/MineralAggregateController.java

@@ -28,7 +28,7 @@ public class MineralAggregateController {
      * @date 2024/05/30
      **/
     @RequestMapping("/insert")
-    public Object insert(@RequestBody @Valid MineralAggregateInsertParam mineralAggregateInsertParam){
+    public HttpResult insert(@RequestBody @Valid MineralAggregateInsertParam mineralAggregateInsertParam){
         return mineralAggregateService.insert(mineralAggregateInsertParam);
     }
 
@@ -38,7 +38,7 @@ public class MineralAggregateController {
      * @date 2024/05/30
      **/
     @PostMapping("/delete")
-    public Object delete(@RequestParam("id") String id){
+    public HttpResult delete(@RequestParam("id") String id){
         return mineralAggregateService.AggreDelete(id);
     }
 
@@ -48,7 +48,7 @@ public class MineralAggregateController {
      * @date 2024/05/30
      **/
     @RequestMapping("/update")
-    public Object update(@RequestBody @Valid MineralAggregateUpdateParam mineralAggregateUpdateParam){
+    public HttpResult update(@RequestBody @Valid MineralAggregateUpdateParam mineralAggregateUpdateParam){
         return mineralAggregateService.update(mineralAggregateUpdateParam);
     }
 
@@ -58,8 +58,8 @@ public class MineralAggregateController {
      * @date 2024/05/30
      **/
     @GetMapping("/detail")
-    public Object detail(@RequestParam("id") String id){
-        return mineralAggregateService.detail(id);
+    public HttpResult detail(@RequestParam("id") String id){
+        return HttpResult.ok(mineralAggregateService.detail(id));
     }
 
     /**
@@ -68,7 +68,7 @@ public class MineralAggregateController {
      * @date 2024/05/30
      **/
     @RequestMapping("/pageList")
-    public HttpResult pageList(MineralAggPageListParam mineralAggPageListParam) {
+    public HttpResult pageList(@RequestBody @Valid MineralAggPageListParam mineralAggPageListParam) {
         return mineralAggregateService.pageList(mineralAggPageListParam);
     }
 

business-modules/business-mine/src/main/java/com/sckw/mine/entity/req/MineralAggPageListParam.java

@@ -13,4 +13,12 @@ public class MineralAggPageListParam {
     private Integer page;
 
     private Integer pageSize;
+
+    private String code;
+
+    private String tenantId;
+
+    private String name;
+
+    private Integer status;
 }

business-modules/business-mine/src/main/java/com/sckw/mine/entity/res/KwBusinessMineralAggregateDetailRes.java

@@ -37,6 +37,7 @@ public class KwBusinessMineralAggregateDetailRes implements Serializable {
      * 矿料类型
      */
     private Integer type;
+    private String typeStr;
 
     /**
      * 计量单位

business-modules/business-mine/src/main/java/com/sckw/mine/entity/res/MineralAggregateListRes.java

@@ -17,6 +17,8 @@ public class MineralAggregateListRes {
      */
     private String id;
 
+    private String code;
+
     /**
      * 租户id
      */
@@ -53,6 +55,7 @@ public class MineralAggregateListRes {
      * 状态=1(正常)
      */
     private Integer status;
+    private String statusStr;
 
     /**
      * create_by

business-modules/business-mine/src/main/java/com/sckw/mine/enums/MineralAggregateTypeEnum.java

@@ -0,0 +1,37 @@
+package com.sckw.mine.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@AllArgsConstructor
+@Getter
+public enum MineralAggregateTypeEnum {
+    ONE(1, "矿料类型1"),
+    TWO(2, "矿料类型2")
+    ;
+
+    private final Integer code;
+    private final String msg;
+
+
+    public static String getNameByCode(Integer code) {
+        MineralAggregateTypeEnum[] enums = MineralAggregateTypeEnum.values();
+        for (MineralAggregateTypeEnum instance : enums) {
+            if (Objects.equals(instance.getCode(), code)) {
+                return instance.getMsg();
+            }
+        }
+        return null;
+    }
+
+    public static List<MineralAggregateTypeEnum> getSortList() {
+        MineralAggregateTypeEnum[] enums = MineralAggregateTypeEnum.values();
+        return Arrays.stream(enums).sorted(Comparator.comparingInt(MineralAggregateTypeEnum::getCode)).collect(Collectors.toList());
+    }
+}

business-modules/business-mine/src/main/java/com/sckw/mine/service/MineralAggregateService.java

@@ -8,6 +8,7 @@ import com.github.pagehelper.PageInfo;
 import com.sckw.core.model.constant.Global;
 import com.sckw.core.model.page.PageRes;
 import com.sckw.core.utils.IdWorker;
+import com.sckw.core.utils.StringUtils;
 import com.sckw.core.utils.TenantUtil;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.mine.common.OrderServerCommon;
@@ -17,6 +18,7 @@ import com.sckw.mine.entity.req.MineralAggregateInsertParam;
 import com.sckw.mine.entity.req.MineralAggregateUpdateParam;
 import com.sckw.mine.entity.res.KwBusinessMineralAggregateDetailRes;
 import com.sckw.mine.entity.res.MineralAggregateListRes;
+import com.sckw.mine.enums.MineralAggregateTypeEnum;
 import com.sckw.mine.mapper.MineralAggregateMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -87,21 +89,31 @@ public class MineralAggregateService {
             throw new RuntimeException("当前名称已存在");
         }
 
-
         int ret = mineralAggregateMapper.aggreUpdate(param);
         return ret>0?HttpResult.ok():HttpResult.error();
     }
 
 
     public KwBusinessMineralAggregateDetailRes detail(String id) {
-        return mineralAggregateMapper.load(id);
+        KwBusinessMineralAggregateDetailRes load = mineralAggregateMapper.load(id);
+        load.setStatusStr(load.getStatus()==1?"启用":"禁用");
+        load.setTypeStr(MineralAggregateTypeEnum.getNameByCode(load.getType()));
+        return load;
     }
 
 
     public HttpResult pageList(MineralAggPageListParam param) {
 
+        String tenant = TenantUtil.getTenant();
+        if (StringUtils.isNotBlank(tenant)) {
+            param.setTenantId(tenant);
+        }
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<MineralAggregateListRes> businessTruckPageListRes = mineralAggregateMapper.mineAggregatePageList(param);
+        businessTruckPageListRes.forEach(e -> {
+            e.setTypeStr(MineralAggregateTypeEnum.getNameByCode(e.getType()));
+            e.setStatusStr(e.getStatus()==1?"启用":"禁用");
+        });
         return HttpResult.ok(new PageRes<>(new PageInfo<>(businessTruckPageListRes)));
     }
 

business-modules/business-mine/src/main/resources/mapper/MineralAggregateMapper.xml

@@ -28,10 +28,20 @@
         select <include refid="Base_Column_List" /> from kw_business_mineral_aggregate
         <where>
             del_flag = 0
+            <if test="param.name != '' and param.name != null">
+                and code like concat('%',#{param.name},'%')
+            </if>
             <if test="param.code != '' and param.code != null">
                 and code like concat('%',#{param.code},'%')
             </if>
+            <if test="param.tenantId != '' and param.tenantId != null">
+                and tenant_id = #{param.tenantId}
+            </if>
+            <if test="param.status != null">
+                and `status` = #{param.status}
+            </if>
         </where>
+        order by create_time desc
     </select>
     <select id="load" resultType="com.sckw.mine.entity.res.KwBusinessMineralAggregateDetailRes">
         select <include refid="Base_Column_List" /> from kw_business_mineral_aggregate where id = #{id}