修改代码生成器bug

Api/src/test/java/com/java110/AppTest.java

@@ -2,6 +2,7 @@ package com.java110;
 
 import static org.junit.Assert.assertTrue;
 
+import com.alibaba.fastjson.JSONObject;
 import org.junit.Test;
 
 /**
@@ -17,4 +18,19 @@ public class AppTest
     {
         assertTrue( true );
     }
+
+    @Test
+    public void jsonRemoveTest(){
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("wuxw","123213");
+        jsonObject.put("wangym","344444");
+
+        System.out.printf(jsonObject.toJSONString());
+
+        jsonObject.remove("wuxw");
+
+        System.out.printf(jsonObject.toJSONString());
+
+
+    }
 }

CommunityService/src/main/java/com/java110/community/listener/floor/AbstractFloorBusinessServiceDataFlowListener.java

@@ -15,16 +15,16 @@ import java.util.List;
 import java.util.Map;
 
 /**
- *
  * 小区楼 服务侦听 父类
  * Created by wuxw on 2018/7/4.
  */
-public abstract class AbstractFloorBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener{
+public abstract class AbstractFloorBusinessServiceDataFlowListener extends AbstractBusinessServiceDataFlowListener {
     private final static Logger logger = LoggerFactory.getLogger(AbstractFloorBusinessServiceDataFlowListener.class);
 
 
     /**
      * 获取 DAO工具类
+     *
      * @return
      */
     public abstract IFloorServiceDao getFloorServiceDaoImpl();
@@ -32,16 +32,17 @@ public abstract class AbstractFloorBusinessServiceDataFlowListener extends Abstr
     /**
      * 刷新 businessFloorInfo 数据
      * 主要将 数据库 中字段和 接口传递字段建立关系
+     *
      * @param businessFloorInfo
      */
-    protected void flushBusinessFloorInfo(Map businessFloorInfo,String statusCd){
-        businessFloorInfo.put("newBId",businessFloorInfo.get("b_id"));
-        businessFloorInfo.put("floorId",businessFloorInfo.get("floor_id"));
-businessFloorInfo.put("operate",businessFloorInfo.get("operate"));
-businessFloorInfo.put("name",businessFloorInfo.get("name"));
-businessFloorInfo.put("remark",businessFloorInfo.get("remark"));
-businessFloorInfo.put("userId",businessFloorInfo.get("user_id"));
-businessFloorInfo.put("floorNum",businessFloorInfo.get("floor_num"));
+    protected void flushBusinessFloorInfo(Map businessFloorInfo, String statusCd) {
+        businessFloorInfo.put("newBId", businessFloorInfo.get("b_id"));
+        businessFloorInfo.put("floorId", businessFloorInfo.get("floor_id"));
+        businessFloorInfo.put("operate", businessFloorInfo.get("operate"));
+        businessFloorInfo.put("name", businessFloorInfo.get("name"));
+        businessFloorInfo.put("remark", businessFloorInfo.get("remark"));
+        businessFloorInfo.put("userId", businessFloorInfo.get("user_id"));
+        businessFloorInfo.put("floorNum", businessFloorInfo.get("floor_num"));
 
         businessFloorInfo.put("statusCd", statusCd);
     }
@@ -49,36 +50,34 @@ businessFloorInfo.put("floorNum",businessFloorInfo.get("floor_num"));
 
     /**
      * 当修改数据时，查询instance表中的数据 自动保存删除数据到business中
+     *
      * @param businessFloor 小区楼信息
      */
-    protected void autoSaveDelBusinessFloor(Business business, JSONObject businessFloor){
+    protected void autoSaveDelBusinessFloor(Business business, JSONObject businessFloor) {
 //自动插入DEL
         Map info = new HashMap();
-        info.put("floorId",businessFloor.getString("floorId"));
-        info.put("statusCd",StatusConstant.STATUS_CD_VALID);
+        info.put("floorId", businessFloor.getString("floorId"));
+        info.put("statusCd", StatusConstant.STATUS_CD_VALID);
         List<Map> currentFloorInfos = getFloorServiceDaoImpl().getFloorInfo(info);
-        if(currentFloorInfos == null || currentFloorInfos.size() != 1){
-            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR,"未找到需要修改数据信息，入参错误或数据有问题，请检查"+info);
+        if (currentFloorInfos == null || currentFloorInfos.size() != 1) {
+            throw new ListenerExecuteException(ResponseConstant.RESULT_PARAM_ERROR, "未找到需要修改数据信息，入参错误或数据有问题，请检查" + info);
         }
 
         Map currentFloorInfo = currentFloorInfos.get(0);
 
-        currentFloorInfo.put("bId",business.getbId());
+        currentFloorInfo.put("bId", business.getbId());
 
-        currentFloorInfo.put("floorId",currentFloorInfo.get("floor_id"));
-currentFloorInfo.put("operate",currentFloorInfo.get("operate"));
-currentFloorInfo.put("name",currentFloorInfo.get("name"));
-currentFloorInfo.put("remark",currentFloorInfo.get("remark"));
-currentFloorInfo.put("userId",currentFloorInfo.get("user_id"));
-currentFloorInfo.put("floorNum",currentFloorInfo.get("floor_num"));
+        currentFloorInfo.put("floorId", currentFloorInfo.get("floor_id"));
+        currentFloorInfo.put("operate", currentFloorInfo.get("operate"));
+        currentFloorInfo.put("name", currentFloorInfo.get("name"));
+        currentFloorInfo.put("remark", currentFloorInfo.get("remark"));
+        currentFloorInfo.put("userId", currentFloorInfo.get("user_id"));
+        currentFloorInfo.put("floorNum", currentFloorInfo.get("floor_num"));
 
 
-        currentFloorInfo.put("operate",StatusConstant.OPERATE_DEL);
+        currentFloorInfo.put("operate", StatusConstant.OPERATE_DEL);
         getFloorServiceDaoImpl().saveBusinessFloorInfo(currentFloorInfo);
     }
 
 
-
-
-
 }

CommunityService/src/main/java/com/java110/community/listener/unit/AbstractUnitBusinessServiceDataFlowListener.java

@@ -45,6 +45,8 @@ public abstract class AbstractUnitBusinessServiceDataFlowListener extends Abstra
         businessUnitInfo.put("lift", businessUnitInfo.get("lift"));
         businessUnitInfo.put("remark", businessUnitInfo.get("remark"));
         businessUnitInfo.put("userId", businessUnitInfo.get("user_id"));
+        //删除bId
+        businessUnitInfo.remove("bId");
 
         businessUnitInfo.put("statusCd", statusCd);
     }

java110-code-generator/src/main/java/com/java110/code/GeneratorAbstractBussiness.java

@@ -27,6 +27,8 @@ public class GeneratorAbstractBussiness extends BaseGenerator {
 
         }
 
+        mappingContext += "business" + toUpperCaseFirstOne(data.getName()) + "Info.remove(\"bId\");";
+
         fileContext = fileContext.replace("$flushBusinessInfo$", mappingContext);
         fileContext = fileContext.replace("$autoSaveDelBusiness$", autoMappingContext);
         System.out.println(this.getClass().getResource("/listener").getPath());

java110-code-generator/src/main/java/com/java110/code/GeneratorServiceDaoImplMapperListener.java

@@ -236,6 +236,10 @@ public class GeneratorServiceDaoImplMapperListener extends BaseGenerator {
 
         Map<String, String> params = data.getParams();
 
+        sql += "<if test=\"newBId != null and newBId != ''\">\n";
+        sql += ",t.b_id = #{newBId}\n";
+        sql += "</if> \n";
+
         for (String key : params.keySet()) {
             if ("operate".equals(key)) {
                 continue;
@@ -249,6 +253,7 @@ public class GeneratorServiceDaoImplMapperListener extends BaseGenerator {
                 sql += ", t." + params.get(key) + "= #{" + key + "}\n";
                 sql += "</if> \n";
             }
+
             if ("bId".equals(key) || data.getId().equals(key)) {
                 sqlWhere += "<if test=\"" + key + " !=null and " + key + " != ''\">\n";
                 sqlWhere += "and t." + params.get(key) + "= #{" + key + "}\n";

java110-config/src/main/resources/mapper/unit/UnitServiceDaoImplMapper.xml

@@ -16,7 +16,7 @@ floor_id,operate,layer_count,unit_id,unit_num,lift,remark,b_id,user_id
 
        <!-- 查询小区单元信息（Business） add by wuxw 2018-07-03 -->
        <select id="getBusinessUnitInfo" parameterType="Map" resultType="Map">
-           select  t.floor_id,t.floor_id floorId,t.operate,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id unitId,t.unit_num,t.unit_num unitNum,t.lift,t.remark,t.b_id,t.b_id bId,t.user_id,t.user_id userId 
+           select  t.floor_id,t.floor_id floorId,t.operate,t.layer_count,t.layer_count layerCount,t.unit_id,t.unit_id unitId,t.unit_num,t.unit_num unitNum,t.lift,t.remark,t.b_id,t.b_id bId,t.user_id,t.user_id userId
 from business_building_unit t 
 where 1 =1 
 <if test="floorId !=null and floorId != ''">
@@ -132,30 +132,33 @@ where 1 =1
     <!-- 修改小区单元信息 add by wuxw 2018-07-03 -->
     <update id="updateUnitInfoInstance" parameterType="Map">
         update  building_unit t set t.status_cd = #{statusCd}
-<if test="floorId !=null and floorId != ''">
-, t.floor_id= #{floorId}
-</if> 
-<if test="layerCount !=null and layerCount != ''">
-, t.layer_count= #{layerCount}
-</if> 
-<if test="unitNum !=null and unitNum != ''">
-, t.unit_num= #{unitNum}
-</if> 
-<if test="lift !=null and lift != ''">
-, t.lift= #{lift}
-</if> 
-<if test="remark !=null and remark != ''">
-, t.remark= #{remark}
-</if> 
-<if test="userId !=null and userId != ''">
-, t.user_id= #{userId}
-</if> 
- where 1=1 <if test="unitId !=null and unitId != ''">
-and t.unit_id= #{unitId}
-</if> 
-<if test="bId !=null and bId != ''">
-and t.b_id= #{bId}
-</if> 
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="floorId !=null and floorId != ''">
+            , t.floor_id= #{floorId}
+        </if>
+        <if test="layerCount !=null and layerCount != ''">
+            , t.layer_count= #{layerCount}
+        </if>
+        <if test="unitNum !=null and unitNum != ''">
+            , t.unit_num= #{unitNum}
+        </if>
+        <if test="lift !=null and lift != ''">
+            , t.lift= #{lift}
+        </if>
+        <if test="remark !=null and remark != ''">
+            , t.remark= #{remark}
+        </if>
+        <if test="userId !=null and userId != ''">
+            , t.user_id= #{userId}
+        </if>
+        where 1=1 <if test="unitId !=null and unitId != ''">
+        and t.unit_id= #{unitId}
+    </if>
+        <if test="bId !=null and bId != ''">
+            and t.b_id= #{bId}
+        </if>
 
     </update>