优化代码

java110-bean/src/main/java/com/java110/dto/maintainanceItem/MaintainanceItemDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.maintainanceItem;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,11 +15,15 @@ import java.util.Date;
  **/
 public class MaintainanceItemDto extends PageDto implements Serializable {
 
+    public static final String TITLE_TYPE_SINGLE = "1001"; // 单选题
+    public static final String TITLE_TYPE_MULTIPLE = "2002"; // 多选题
+    public static final String TITLE_TYPE_QUESTIONS = "3003"; // 简答题
+
     private String itemId;
-private String titleType;
-private String itemTitle;
-private String communityId;
-private String seq;
+    private String titleType;
+    private String itemTitle;
+    private String communityId;
+    private String seq;
 
 
     private Date createTime;
@@ -29,31 +34,40 @@ private String seq;
     public String getItemId() {
         return itemId;
     }
-public void setItemId(String itemId) {
+
+    public void setItemId(String itemId) {
         this.itemId = itemId;
     }
-public String getTitleType() {
+
+    public String getTitleType() {
         return titleType;
     }
-public void setTitleType(String titleType) {
+
+    public void setTitleType(String titleType) {
         this.titleType = titleType;
     }
-public String getItemTitle() {
+
+    public String getItemTitle() {
         return itemTitle;
     }
-public void setItemTitle(String itemTitle) {
+
+    public void setItemTitle(String itemTitle) {
         this.itemTitle = itemTitle;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getSeq() {
+
+    public String getSeq() {
         return seq;
     }
-public void setSeq(String seq) {
+
+    public void setSeq(String seq) {
         this.seq = seq;
     }
 

service-community/src/main/java/com/java110/community/cmd/maintainance/DeleteMaintainanceItemCmd.java

@@ -21,8 +21,13 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.dto.inspectionItemTitleValue.InspectionItemTitleValueDto;
+import com.java110.dto.maintainanceItemValue.MaintainanceItemValueDto;
 import com.java110.intf.community.IMaintainanceItemV1InnerServiceSMO;
+import com.java110.intf.community.IMaintainanceItemValueV1InnerServiceSMO;
+import com.java110.po.inspectionItemTitleValue.InspectionItemTitleValuePo;
 import com.java110.po.maintainanceItem.MaintainanceItemPo;
+import com.java110.po.maintainanceItemValue.MaintainanceItemValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -48,6 +53,10 @@ public class DeleteMaintainanceItemCmd extends Cmd {
     @Autowired
     private IMaintainanceItemV1InnerServiceSMO maintainanceItemV1InnerServiceSMOImpl;
 
+
+    @Autowired
+    private IMaintainanceItemValueV1InnerServiceSMO maintainanceItemValueV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "itemId", "itemId不能为空");
@@ -66,6 +75,19 @@ public class DeleteMaintainanceItemCmd extends Cmd {
             throw new CmdException("删除数据失败");
         }
 
+        MaintainanceItemValuePo maintainanceItemValuePo = new MaintainanceItemValuePo();
+        maintainanceItemValuePo.setItemId(maintainanceItemPo.getItemId());
+
+        MaintainanceItemValueDto tmpMaintainanceItemValueDto = BeanConvertUtil.covertBean(reqJson, MaintainanceItemValueDto.class);
+        int count = maintainanceItemValueV1InnerServiceSMOImpl.queryMaintainanceItemValuesCount(tmpMaintainanceItemValueDto);
+
+        if (count > 0) {
+            flag = maintainanceItemValueV1InnerServiceSMOImpl.deleteMaintainanceItemValue(maintainanceItemValuePo);
+            if (flag < 1) {
+                throw new CmdException("更新数据失败");
+            }
+        }
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-community/src/main/java/com/java110/community/cmd/maintainance/SaveMaintainanceItemCmd.java

@@ -15,15 +15,22 @@
  */
 package com.java110.community.cmd.maintainance;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.java110.community.dao.IMaintainanceItemValueV1ServiceDao;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.inspectionItemTitle.InspectionItemTitleDto;
+import com.java110.dto.maintainanceItem.MaintainanceItemDto;
 import com.java110.intf.community.IMaintainanceItemV1InnerServiceSMO;
+import com.java110.intf.community.IMaintainanceItemValueV1InnerServiceSMO;
+import com.java110.po.inspectionItemTitleValue.InspectionItemTitleValuePo;
 import com.java110.po.maintainanceItem.MaintainanceItemPo;
+import com.java110.po.maintainanceItemValue.MaintainanceItemValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -52,6 +59,9 @@ public class SaveMaintainanceItemCmd extends Cmd {
     @Autowired
     private IMaintainanceItemV1InnerServiceSMO maintainanceItemV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IMaintainanceItemValueV1InnerServiceSMO maintainanceItemValueV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "itemTitle", "请求报文中未包含itemTitle");
@@ -59,6 +69,13 @@ public class SaveMaintainanceItemCmd extends Cmd {
         Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
         Assert.hasKeyAndValue(reqJson, "seq", "请求报文中未包含seq");
 
+        JSONArray titleValues = null;
+        if (!MaintainanceItemDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
+            titleValues = reqJson.getJSONArray("titleValues");
+            if (titleValues.size() < 1) {
+                throw new IllegalArgumentException("未包含选项");
+            }
+        }
     }
 
     @Override
@@ -73,6 +90,23 @@ public class SaveMaintainanceItemCmd extends Cmd {
             throw new CmdException("保存数据失败");
         }
 
+
+        if (MaintainanceItemDto.TITLE_TYPE_QUESTIONS.equals(maintainanceItemPo.getTitleType())) {
+            cmdDataFlowContext.setResponseEntity(ResultVo.success());
+            return;
+        }
+        JSONArray titleValues = reqJson.getJSONArray("titleValues");
+        MaintainanceItemValuePo maintainanceItemValuePo = null;
+        for (int titleValueIndex = 0; titleValueIndex < titleValues.size(); titleValueIndex++) {
+            maintainanceItemValuePo = new MaintainanceItemValuePo();
+            maintainanceItemValuePo.setItemValue(titleValues.getJSONObject(titleValueIndex).getString("itemValue"));
+            maintainanceItemValuePo.setSeq(titleValues.getJSONObject(titleValueIndex).getString("seq"));
+            maintainanceItemValuePo.setItemId(maintainanceItemPo.getItemId());
+            maintainanceItemValuePo.setValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_valueId));
+            maintainanceItemValuePo.setCommunityId(maintainanceItemPo.getCommunityId());
+            maintainanceItemValueV1InnerServiceSMOImpl.saveMaintainanceItemValue(maintainanceItemValuePo);
+        }
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-community/src/main/java/com/java110/community/cmd/maintainance/UpdateMaintainanceItemCmd.java

@@ -15,14 +15,21 @@
  */
 package com.java110.community.cmd.maintainance;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
+import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.inspectionItemTitle.InspectionItemTitleDto;
+import com.java110.dto.maintainanceItem.MaintainanceItemDto;
+import com.java110.dto.maintainanceItemValue.MaintainanceItemValueDto;
 import com.java110.intf.community.IMaintainanceItemV1InnerServiceSMO;
+import com.java110.intf.community.IMaintainanceItemValueV1InnerServiceSMO;
 import com.java110.po.maintainanceItem.MaintainanceItemPo;
+import com.java110.po.maintainanceItemValue.MaintainanceItemValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -31,6 +38,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 
 /**
  * 类表述：更新
@@ -51,11 +60,23 @@ public class UpdateMaintainanceItemCmd extends Cmd {
     @Autowired
     private IMaintainanceItemV1InnerServiceSMO maintainanceItemV1InnerServiceSMOImpl;
 
+
+    @Autowired
+    private IMaintainanceItemValueV1InnerServiceSMO maintainanceItemValueV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "itemId", "itemId不能为空");
         Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
 
+        JSONArray titleValues = null;
+        if (!MaintainanceItemDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
+            titleValues = reqJson.getJSONArray("titleValues");
+            if (titleValues.size() < 1) {
+                throw new IllegalArgumentException("未包含选项");
+            }
+        }
+
     }
 
     @Override
@@ -69,6 +90,33 @@ public class UpdateMaintainanceItemCmd extends Cmd {
             throw new CmdException("更新数据失败");
         }
 
+        if (InspectionItemTitleDto.TITLE_TYPE_QUESTIONS.equals(maintainanceItemPo.getTitleType())) {
+            cmdDataFlowContext.setResponseEntity(ResultVo.success());
+            return;
+        }
+        MaintainanceItemValueDto maintainanceItemValueDto = new MaintainanceItemValueDto();
+        maintainanceItemValueDto.setItemId(reqJson.getString("itemId"));
+        List<MaintainanceItemValueDto> maintainanceItemValueDtos = maintainanceItemValueV1InnerServiceSMOImpl.queryMaintainanceItemValues(maintainanceItemValueDto);
+        if (maintainanceItemValueDtos != null && maintainanceItemValueDtos.size() > 0) {
+            MaintainanceItemValuePo deleteMaintainanceItemValuePo = new MaintainanceItemValuePo();
+            deleteMaintainanceItemValuePo.setItemId(maintainanceItemPo.getItemId());
+            flag = maintainanceItemValueV1InnerServiceSMOImpl.deleteMaintainanceItemValue(deleteMaintainanceItemValuePo);
+            if (flag < 1) {
+                throw new CmdException("更新数据失败");
+            }
+        }
+        JSONArray titleValues = reqJson.getJSONArray("titleValues");
+        MaintainanceItemValuePo maintainanceItemValuePo = null;
+        for (int titleValueIndex = 0; titleValueIndex < titleValues.size(); titleValueIndex++) {
+            maintainanceItemValuePo = new MaintainanceItemValuePo();
+            maintainanceItemValuePo.setItemValue(titleValues.getJSONObject(titleValueIndex).getString("itemValue"));
+            maintainanceItemValuePo.setSeq(titleValues.getJSONObject(titleValueIndex).getString("seq"));
+            maintainanceItemValuePo.setItemId(maintainanceItemPo.getItemId());
+            maintainanceItemValuePo.setValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_valueId));
+            maintainanceItemValuePo.setCommunityId(maintainanceItemPo.getCommunityId());
+            maintainanceItemValueV1InnerServiceSMOImpl.saveMaintainanceItemValue(maintainanceItemValuePo);
+        }
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }