初始化台账更改为feign调用

blade-service-api/blade-business-api/pom.xml

@@ -12,6 +12,12 @@
     <artifactId>blade-business-api</artifactId>
     <name>${project.artifactId}</name>
     <version>${bladex.project.version}</version>
+    <dependencies>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-common</artifactId>
+        </dependency>
+    </dependencies>
     <packaging>jar</packaging>
 
 </project>

blade-service-api/blade-business-api/src/main/java/org/springblade/business/feign/ConstructionLedgerFeign.java

@@ -0,0 +1,18 @@
+package org.springblade.business.feign;
+
+
+import org.springblade.business.entity.ConstructionLedger;
+import org.springblade.common.constant.BusinessConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(value =
+        BusinessConstant.APPLICATION_WEATHER_NAME
+)
+public interface ConstructionLedgerFeign {
+    String INIT_URL = "/initConstructionLedger";
+
+    @PostMapping(INIT_URL)
+    boolean initConstructionLedger(@RequestBody ConstructionLedger constructionLedger);
+}

blade-service/blade-business/src/main/java/org/springblade/business/controller/ConstructionLedgerController.java

@@ -116,4 +116,6 @@ public class ConstructionLedgerController extends BladeController {
 		}
 	}
 
+
+
 }

blade-service/blade-business/src/main/java/org/springblade/business/feignClient/ConstructionLedgerFeignController.java

@@ -0,0 +1,32 @@
+package org.springblade.business.feignClient;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.AllArgsConstructor;
+import org.springblade.business.entity.ConstructionLedger;
+import org.springblade.business.feign.ConstructionLedgerFeign;
+import org.springblade.business.service.IConstructionLedgerService;
+import org.springblade.core.tenant.annotation.NonDS;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@AllArgsConstructor
+@NonDS
+public class ConstructionLedgerFeignController implements ConstructionLedgerFeign {
+
+    private final IConstructionLedgerService iConstructionLedgerService;
+
+    /**
+     * 初始化台账feign
+     */
+    @Override
+    @PostMapping(INIT_URL)
+    public boolean initConstructionLedger(@RequestBody ConstructionLedger constructionLedger) {
+        boolean save = iConstructionLedgerService.save(constructionLedger);
+        if (save) {
+            return true;
+        }
+        return false;
+    }
+}

blade-service/blade-manager/pom.xml

@@ -48,7 +48,7 @@
         </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
-            <artifactId>blade-business</artifactId>
+            <artifactId>blade-business-api</artifactId>
             <version>${bladex.project.version}</version>
         </dependency>
 
@@ -92,6 +92,7 @@
             <artifactId>jsoup</artifactId>
             <version>1.10.2</version>
         </dependency>
+
     </dependencies>
 
 </project>

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreePrivateController.java

@@ -2,17 +2,12 @@ package org.springblade.manager.controller;
 
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
-import org.apache.commons.lang.StringUtils;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.support.Kv;
-import org.springblade.manager.dto.WbsTreeDTO;
-import org.springblade.manager.entity.WbsFormElement;
 import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.service.IWbsTreePrivateService;
 import org.springblade.manager.vo.WbsNodeTableVO;
@@ -70,7 +65,7 @@ public class WbsTreePrivateController extends BladeController {
 
     @GetMapping("/removeTableByCondition")
     @ApiOperationSupport(order = 3)
-    @ApiOperation(value = "表单删除", notes = "传入表单id、wbsId、projectId")
+    @ApiOperation(value = "删除节点下的元素表", notes = "传入表单id、wbsId、projectId")
     public R removeTableByCondition(@RequestParam("id") String id,
                                     @RequestParam("wbsId") String wbsId,
                                     @RequestParam("projectId") String projectId) {

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.xml

@@ -47,7 +47,7 @@
 
     <insert id="insertWbsTreeContract1">
             INSERT INTO m_wbs_tree_contract(
-            id,private_node_id,wbs_id,wbs_type,project_id,contract_id,tenant_id,parent_id,ancestors,dept_category,dept_name,full_name,sort,remark,`type`,
+            p_key_id,id,wbs_id,wbs_type,project_id,contract_id,tenant_id,parent_id,ancestors,dept_category,dept_name,full_name,sort,remark,`type`,
             table_type,create_time,create_user,create_dept,update_user,update_time,`STATUS`,is_deleted,
             unique_code,partition_code,is_expernode,is_concrete,table_owner,major_data_type,init_table_name,is_link_table)
             VALUES(
@@ -70,7 +70,7 @@
     <update id="updateByCondition">
             UPDATE m_wbs_tree_contract
             SET is_deleted = 0
-            WHERE private_node_id = #{id}
+            WHERE id = #{id}
             AND wbs_id = #{wbsId}
             AND project_id =#{projectId}
             AND contract_id = #{contractId}
@@ -113,7 +113,7 @@
         FROM
             m_wbs_tree_contract
         WHERE
-            private_node_id = #{id}
+            id = #{id}
             AND project_id = #{projectId}
             AND contract_id = #{contractId}
             AND wbs_id = #{wbsId}

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.java

@@ -54,4 +54,7 @@ public interface WbsTreePrivateMapper extends BaseMapper<WbsTreePrivate> {
 
 
     List<WbsNodeTableVO> selectByNodeTable(String id, String wbsId, String projectId);
+
+    int updateByCondition1(String id, String wbsId, String projectId);
+
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.xml

@@ -106,6 +106,15 @@
         AND project_id = #{projectId}
     </update>
 
+    <update id="updateByCondition1">
+        UPDATE m_wbs_tree_private SET is_deleted = 1
+        WHERE status = 1
+        AND type = 2
+        AND id = #{id}
+        AND wbs_id = #{wbsId}
+        AND project_id = #{projectId}
+    </update>
+
 
     <select id="selectAll" resultMap="resultMap2">
         SELECT

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -1,9 +1,10 @@
 package org.springblade.manager.service.impl;
 
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang.StringUtils;
+import org.springblade.business.entity.ConstructionLedger;
+import org.springblade.business.feign.ConstructionLedgerFeign;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.logger.BladeLogger;
 import org.springblade.core.mp.base.BaseServiceImpl;
@@ -13,7 +14,6 @@ import org.springblade.manager.entity.WbsTreeContract;
 import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.mapper.WbsInfoMapper;
 import org.springblade.manager.mapper.WbsTreeContractMapper;
-import org.springblade.manager.mapper.WbsTreeMapper;
 import org.springblade.manager.mapper.WbsTreePrivateMapper;
 import org.springblade.manager.service.IWbsTreeContractService;
 import org.springframework.stereotype.Service;
@@ -29,7 +29,7 @@ public class WbsTreeContractServiceImpl
 
     private final BladeLogger logger;
     private final WbsTreePrivateServiceImpl wbsTreePrivateService;
-//    private final ConstructionLedgerMapper constructionLedgerMapper;
+    private final ConstructionLedgerFeign constructionLedgerFeign;
     private final WbsTreePrivateMapper wbsTreePrivateMapper;
     private final WbsInfoMapper wbsInfoMapper;
 
@@ -64,7 +64,6 @@ public class WbsTreeContractServiceImpl
                     } else {
                         //获取WbsTreePrivate对象
                         WbsTreePrivate wbsTreePrivate = wbsTreePrivateMapper.selectByCondition(id, pawDTO.getProjectId());
-
                         Integer wbsType = wbsInfo.getWbsType();
                         Long snowId = SnowFlakeUtil.getId();
                         Integer row = baseMapper.insertWbsTreeContract1(snowId, wbsType, pawDTO.getContractId(), wbsTreePrivate);
@@ -72,17 +71,13 @@ public class WbsTreeContractServiceImpl
                             logger.info(wbsTreePrivate.getId().toString(), "初始化合同段wbs树成功");
                         }
                         //初始化施工台账
-                        if (wbsTreePrivate.getDeptCategory() == 6
-                                && wbsTreePrivate.getDeptCategory() != null
-                                && !("").equals(wbsTreePrivate.getDeptCategory())) {
-                            /*ConstructionLedger constructionLedger = new ConstructionLedger();
+                        System.out.println("wbsTreePrivate.getDeptCategory() : "+wbsTreePrivate.getDeptCategory());
+                        if (wbsTreePrivate.getDeptCategory() == 6) {
+                            ConstructionLedger constructionLedger = new ConstructionLedger();
                             constructionLedger.setIsBeton(0);
                             constructionLedger.setWbsId(Long.parseLong(pawDTO.getWbsId()));
-                            constructionLedger.setContractId(Long.parseLong(pawDTO.getContractId()));*/
-                            /*int b2 = constructionLedgerMapper.insert(constructionLedger);
-                            if (b2 > 0) {
-                                logger.info(constructionLedger.getId().toString(), "初始化施工台账成功");
-                            }*/
+                            constructionLedger.setContractId(Long.parseLong(pawDTO.getContractId()));
+                            constructionLedgerFeign.initConstructionLedger(constructionLedger);
                         }
                     }
                 }

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -60,13 +60,7 @@ public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMap
 
     @Override
     public boolean removeTableByCondition(String id, String wbsId, String projectId) {
-        UpdateWrapper<WbsTreePrivate> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.set("is_deleted", 1);
-        updateWrapper.eq("id", id);
-        updateWrapper.eq("wbs_id", wbsId);
-        updateWrapper.eq("project_id", projectId);
-        updateWrapper.eq("sataus", 1);
-        int integer = baseMapper.delete(updateWrapper);
+        int integer = baseMapper.updateByCondition1(id,wbsId,projectId);
         if (integer > 0) {
             return true;
         }