矿山域-流程管理

business-common/business-common-core/src/main/java/com/sckw/core/filter/TenantFilter.java

@@ -21,7 +21,7 @@ public class TenantFilter extends OncePerRequestFilter {
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
         String tenantId = WebFrameworkUtils.getTenantId(request);
-        TenantUtil.setTenant(StrUtil.isBlank(tenantId) ? "1" : tenantId);
+        TenantUtil.setTenant(StrUtil.isBlank(tenantId) || tenantId.equals("null") ? "1" : tenantId);
         try {
             filterChain.doFilter(request, response);
         } finally {

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

@@ -4,6 +4,7 @@ import com.sckw.core.web.response.HttpResult;
 import com.sckw.mine.entity.req.MineralAggPageListParam;
 import com.sckw.mine.entity.req.MineralAggregateInsertParam;
 import com.sckw.mine.entity.req.MineralAggregateUpdateParam;
+import com.sckw.mine.entity.req.StatusActionReq;
 import com.sckw.mine.service.MineralAggregateService;
 import jakarta.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +73,16 @@ public class MineralAggregateController {
         return mineralAggregateService.pageList(mineralAggPageListParam);
     }
 
+    /**
+     * @Description: 状态操作
+     * @Author: Lt
+     * @Date: 2024/5/31 14:46
+     */
+    @PostMapping("/statusAction")
+    public HttpResult statusAction(@RequestBody @Valid StatusActionReq statusActionReq) {
+        return mineralAggregateService.statusAction(statusActionReq);
+    }
+
 
 
 

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

@@ -0,0 +1,20 @@
+package com.sckw.mine.entity.req;
+
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * @desc:
+ * @author: Lt
+ * @date: 2024-06-13
+ */
+@Data
+public class StatusActionReq {
+
+    @NotNull(message = "状态值必填")
+    private Integer status;
+
+    @NotBlank(message = "ID必填")
+    private String id;
+}

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

@@ -19,7 +19,7 @@ public class KwBusinessMineralAggregateDetailRes implements Serializable {
     /**
      * id
      */
-    private Long id;
+    private String id;
 
     private String code;
 
@@ -36,13 +36,13 @@ public class KwBusinessMineralAggregateDetailRes implements Serializable {
     /**
      * 矿料类型
      */
-    private Integer type;
+    private String type;
     private String typeStr;
 
     /**
      * 计量单位
      */
-    private Integer unit;
+    private String unit;
 
     /**
      * 矿料尺寸
@@ -52,7 +52,7 @@ public class KwBusinessMineralAggregateDetailRes implements Serializable {
     /**
      * 矿料重量
      */
-    private Double weight;
+    private String weight;
 
     /**
      * 状态=1(正常)

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

@@ -32,13 +32,13 @@ public class MineralAggregateListRes {
     /**
      * 矿料类型
      */
-    private Integer type;
+    private String type;
     private String typeStr;
 
     /**
      * 计量单位
      */
-    private Integer unit;
+    private String unit;
     private String unitStr;
 
     /**
@@ -49,7 +49,7 @@ public class MineralAggregateListRes {
     /**
      * 矿料重量
      */
-    private Double weight;
+    private String weight;
 
     /**
      * 状态=1(正常)

business-modules/business-mine/src/main/java/com/sckw/mine/mapper/MineralAggregateMapper.java

@@ -23,4 +23,6 @@ public interface MineralAggregateMapper extends BaseMapper<KwBusinessMineralAggr
 
     KwBusinessMineralAggregateDetailRes load(@Param("id") String id);
 
+    int statusAction(@Param("id") String id, @Param("status") Integer status);
+
 }

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

@@ -13,9 +13,11 @@ import com.sckw.core.utils.TenantUtil;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.mine.common.OrderServerCommon;
 import com.sckw.mine.entity.KwBusinessMineralAggregate;
+import com.sckw.mine.entity.KwBusinessNode;
 import com.sckw.mine.entity.req.MineralAggPageListParam;
 import com.sckw.mine.entity.req.MineralAggregateInsertParam;
 import com.sckw.mine.entity.req.MineralAggregateUpdateParam;
+import com.sckw.mine.entity.req.StatusActionReq;
 import com.sckw.mine.entity.res.KwBusinessMineralAggregateDetailRes;
 import com.sckw.mine.entity.res.MineralAggregateListRes;
 import com.sckw.mine.enums.MineralAggregateTypeEnum;
@@ -96,7 +98,7 @@ public class MineralAggregateService {
     public KwBusinessMineralAggregateDetailRes detail(String id) {
         KwBusinessMineralAggregateDetailRes load = mineralAggregateMapper.load(id);
         load.setStatusStr(load.getStatus()==1?"启用":"禁用");
-        load.setTypeStr(MineralAggregateTypeEnum.getNameByCode(load.getType()));
+        load.setTypeStr(MineralAggregateTypeEnum.getNameByCode(Integer.valueOf(load.getType())));
         return load;
     }
 
@@ -110,11 +112,40 @@ public class MineralAggregateService {
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<MineralAggregateListRes> businessTruckPageListRes = mineralAggregateMapper.mineAggregatePageList(param);
         businessTruckPageListRes.forEach(e -> {
-            e.setTypeStr(MineralAggregateTypeEnum.getNameByCode(e.getType()));
+            if (ObjectUtils.isNotNull(e.getType())){
+                e.setTypeStr(MineralAggregateTypeEnum.getNameByCode(Integer.valueOf(e.getType())));
+            }
+            if (ObjectUtils.isNotNull(e.getUnit())){
+                e.setUnitStr(e.getUnit()=="1"?"吨":"件");
+            }
             e.setStatusStr(e.getStatus()==1?"启用":"禁用");
-            e.setUnitStr(e.getUnit()==1?"吨":"件");
         });
         return HttpResult.ok(new PageRes<>(new PageInfo<>(businessTruckPageListRes)));
     }
 
+    /**
+     * @Description: 状态操作(停用 启用)   1=启用   2=禁用
+     * @Author: Lt
+     * @Date: 2024/5/31 11:34
+     */
+    public HttpResult statusAction(StatusActionReq param)
+    {
+        if (StringUtils.isBlank(param.getId())) {
+            throw new RuntimeException("id必填");
+        }
+        if(param.getStatus()==null) {
+            throw new RuntimeException("状态必填");
+        }
+        KwBusinessMineralAggregate kwBusinessNode = mineralAggregateMapper.selectById(param.getId());
+        if (ObjectUtils.isNull(kwBusinessNode)) {
+            throw new RuntimeException("当前数据不存在,请检查");
+        }
+
+        int i = mineralAggregateMapper.statusAction(param.getId(), param.getStatus());
+        if (i>0) {
+            return HttpResult.ok("操作成功");
+        }
+        return HttpResult.error("操作失败");
+    }
+
 }

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

@@ -70,5 +70,8 @@
         </set>
         WHERE id = #{param.id}
     </update>
+    <update id="statusAction">
+        update kw_business_mineral_aggregate set status = #{status} where id = #{id}
+    </update>
 
 </mapper>