加入巡检项目功能

java110-bean/src/main/java/com/java110/dto/inspectionItemTitle/InspectionItemTitleDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.inspectionItemTitle;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -14,12 +15,16 @@ import java.util.Date;
  **/
 public class InspectionItemTitleDto 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 titleId;
-private String communityId;
-private String seq;
+    private String titleType;
+    private String itemTitle;
+    private String titleId;
+    private String communityId;
+    private String seq;
 
 
     private Date createTime;
@@ -30,37 +35,48 @@ 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 getTitleId() {
+
+    public String getTitleId() {
         return titleId;
     }
-public void setTitleId(String titleId) {
+
+    public void setTitleId(String titleId) {
         this.titleId = titleId;
     }
-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;
     }
 

java110-db/src/main/resources/mapper/community/InspectionItemTitleValueV1ServiceDaoImplMapper.xml

@@ -5,102 +5,99 @@
 <mapper namespace="inspectionItemTitleValueV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存题目选项信息 add by wuxw 2018-07-03 -->
     <insert id="saveInspectionItemTitleValueInfo" parameterType="Map">
         insert into inspection_item_title_value(
-value_id,title_id,item_value,community_id,seq
-) values (
-#{valueId},#{titleId},#{itemValue},#{communityId},#{seq}
-)
+        value_id,title_id,item_value,community_id,seq
+        ) values (
+        #{valueId},#{titleId},#{itemValue},#{communityId},#{seq}
+        )
     </insert>
 
 
-
     <!-- 查询题目选项信息 add by wuxw 2018-07-03 -->
     <select id="getInspectionItemTitleValueInfo" parameterType="Map" resultType="Map">
-        select  t.value_id,t.value_id valueId,t.title_id,t.title_id titleId,t.item_value,t.item_value itemValue,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.seq 
-from inspection_item_title_value t 
-where 1 =1 
-<if test="valueId !=null and valueId != ''">
-   and t.value_id= #{valueId}
-</if> 
-<if test="titleId !=null and titleId != ''">
-   and t.title_id= #{titleId}
-</if> 
-<if test="itemValue !=null and itemValue != ''">
-   and t.item_value= #{itemValue}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="seq !=null and seq != ''">
-   and t.seq= #{seq}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        select t.value_id,t.value_id valueId,t.title_id,t.title_id titleId,t.item_value,t.item_value
+        itemValue,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.seq
+        from inspection_item_title_value t
+        where 1 =1
+        <if test="valueId !=null and valueId != ''">
+            and t.value_id= #{valueId}
+        </if>
+        <if test="titleId !=null and titleId != ''">
+            and t.title_id= #{titleId}
+        </if>
+        <if test="itemValue !=null and itemValue != ''">
+            and t.item_value= #{itemValue}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="seq !=null and seq != ''">
+            and t.seq= #{seq}
+        </if>
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改题目选项信息 add by wuxw 2018-07-03 -->
     <update id="updateInspectionItemTitleValueInfo" parameterType="Map">
-        update  inspection_item_title_value t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="titleId !=null and titleId != ''">
-, t.title_id= #{titleId}
-</if> 
-<if test="itemValue !=null and itemValue != ''">
-, t.item_value= #{itemValue}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="seq !=null and seq != ''">
-, t.seq= #{seq}
-</if> 
- where 1=1 <if test="valueId !=null and valueId != ''">
-and t.value_id= #{valueId}
-</if> 
+        update inspection_item_title_value t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+
+        <if test="itemValue !=null and itemValue != ''">
+            , t.item_value= #{itemValue}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="seq !=null and seq != ''">
+            , t.seq= #{seq}
+        </if>
+        where 1=1
+        <if test="valueId !=null and valueId != ''">
+            and t.value_id= #{valueId}
+        </if>
+        <if test="titleId !=null and titleId != ''">
+            and t.title_id= #{titleId}
+        </if>
 
     </update>
 
     <!-- 查询题目选项数量 add by wuxw 2018-07-03 -->
-     <select id="queryInspectionItemTitleValuesCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from inspection_item_title_value t 
-where 1 =1 
-<if test="valueId !=null and valueId != ''">
-   and t.value_id= #{valueId}
-</if> 
-<if test="titleId !=null and titleId != ''">
-   and t.title_id= #{titleId}
-</if> 
-<if test="itemValue !=null and itemValue != ''">
-   and t.item_value= #{itemValue}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="seq !=null and seq != ''">
-   and t.seq= #{seq}
-</if> 
+    <select id="queryInspectionItemTitleValuesCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from inspection_item_title_value t
+        where 1 =1
+        <if test="valueId !=null and valueId != ''">
+            and t.value_id= #{valueId}
+        </if>
+        <if test="titleId !=null and titleId != ''">
+            and t.title_id= #{titleId}
+        </if>
+        <if test="itemValue !=null and itemValue != ''">
+            and t.item_value= #{itemValue}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="seq !=null and seq != ''">
+            and t.seq= #{seq}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>

service-community/src/main/java/com/java110/community/cmd/inspectionItemTitle/DeleteInspectionItemTitleCmd.java

@@ -21,16 +21,18 @@ import com.java110.core.annotation.Java110Transactional;
 import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
-import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.intf.community.IInspectionItemTitleV1InnerServiceSMO;
+import com.java110.intf.community.IInspectionItemTitleValueV1InnerServiceSMO;
 import com.java110.po.inspectionItemTitle.InspectionItemTitlePo;
+import com.java110.po.inspectionItemTitleValue.InspectionItemTitleValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
 /**
  * 类表述：删除
  * 服务编码：inspectionItemTitle.deleteInspectionItemTitle
@@ -43,15 +45,17 @@ import org.slf4j.LoggerFactory;
  */
 @Java110Cmd(serviceCode = "inspectionItemTitle.deleteInspectionItemTitle")
 public class DeleteInspectionItemTitleCmd extends AbstractServiceCmdListener {
-  private static Logger logger = LoggerFactory.getLogger(DeleteInspectionItemTitleCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(DeleteInspectionItemTitleCmd.class);
 
     @Autowired
     private IInspectionItemTitleV1InnerServiceSMO inspectionItemTitleV1InnerServiceSMOImpl;
+    @Autowired
+    private IInspectionItemTitleValueV1InnerServiceSMO inspectionItemTitleValueV1InnerServiceSMOImpl;
 
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "titleId", "titleId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
 
     }
 
@@ -59,13 +63,20 @@ Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       InspectionItemTitlePo inspectionItemTitlePo = BeanConvertUtil.covertBean(reqJson, InspectionItemTitlePo.class);
+        InspectionItemTitlePo inspectionItemTitlePo = BeanConvertUtil.covertBean(reqJson, InspectionItemTitlePo.class);
         int flag = inspectionItemTitleV1InnerServiceSMOImpl.deleteInspectionItemTitle(inspectionItemTitlePo);
 
         if (flag < 1) {
             throw new CmdException("删除数据失败");
         }
 
+        InspectionItemTitleValuePo deleteInspectionItemTitleValuePo = new InspectionItemTitleValuePo();
+        deleteInspectionItemTitleValuePo.setTitleId(inspectionItemTitlePo.getTitleId());
+        flag = inspectionItemTitleValueV1InnerServiceSMOImpl.deleteInspectionItemTitleValue(deleteInspectionItemTitleValuePo);
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-community/src/main/java/com/java110/community/cmd/inspectionItemTitle/SaveInspectionItemTitleCmd.java

@@ -15,6 +15,7 @@
  */
 package com.java110.community.cmd.inspectionItemTitle;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
@@ -22,15 +23,18 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.inspectionItemTitle.InspectionItemTitleDto;
 import com.java110.intf.community.IInspectionItemTitleV1InnerServiceSMO;
+import com.java110.intf.community.IInspectionItemTitleValueV1InnerServiceSMO;
 import com.java110.po.inspectionItemTitle.InspectionItemTitlePo;
+import com.java110.po.inspectionItemTitleValue.InspectionItemTitleValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * 类表述：保存
@@ -52,21 +56,31 @@ public class SaveInspectionItemTitleCmd extends AbstractServiceCmdListener {
     @Autowired
     private IInspectionItemTitleV1InnerServiceSMO inspectionItemTitleV1InnerServiceSMOImpl;
 
+
+    @Autowired
+    private IInspectionItemTitleValueV1InnerServiceSMO inspectionItemTitleValueV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "itemId", "请求报文中未包含itemId");
-Assert.hasKeyAndValue(reqJson, "itemTitle", "请求报文中未包含itemTitle");
-Assert.hasKeyAndValue(reqJson, "titleType", "请求报文中未包含titleType");
-Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-Assert.hasKeyAndValue(reqJson, "seq", "请求报文中未包含seq");
-
+        Assert.hasKeyAndValue(reqJson, "itemTitle", "请求报文中未包含itemTitle");
+        Assert.hasKeyAndValue(reqJson, "titleType", "请求报文中未包含titleType");
+        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
+        Assert.hasKeyAndValue(reqJson, "seq", "请求报文中未包含seq");
+        JSONArray titleValues = null;
+        if (!InspectionItemTitleDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
+            titleValues = reqJson.getJSONArray("titleValues");
+            if (titleValues.size() < 1) {
+                throw new IllegalArgumentException("未包含选项");
+            }
+        }
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       InspectionItemTitlePo inspectionItemTitlePo = BeanConvertUtil.covertBean(reqJson, InspectionItemTitlePo.class);
+        InspectionItemTitlePo inspectionItemTitlePo = BeanConvertUtil.covertBean(reqJson, InspectionItemTitlePo.class);
         inspectionItemTitlePo.setTitleId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = inspectionItemTitleV1InnerServiceSMOImpl.saveInspectionItemTitle(inspectionItemTitlePo);
 
@@ -74,6 +88,22 @@ Assert.hasKeyAndValue(reqJson, "seq", "请求报文中未包含seq");
             throw new CmdException("保存数据失败");
         }
 
+        if (InspectionItemTitleDto.TITLE_TYPE_QUESTIONS.equals(inspectionItemTitlePo.getTitleType())) {
+            cmdDataFlowContext.setResponseEntity(ResultVo.success());
+            return;
+        }
+        JSONArray titleValues = reqJson.getJSONArray("titleValues");
+        InspectionItemTitleValuePo reportInfoSettingTitleValuePo = null;
+        for (int titleValueIndex = 0; titleValueIndex < titleValues.size(); titleValueIndex++) {
+            reportInfoSettingTitleValuePo = new InspectionItemTitleValuePo();
+            reportInfoSettingTitleValuePo.setItemValue(titleValues.getJSONObject(titleValueIndex).getString("itemValue"));
+            reportInfoSettingTitleValuePo.setSeq(titleValues.getJSONObject(titleValueIndex).getString("seq"));
+            reportInfoSettingTitleValuePo.setTitleId(inspectionItemTitlePo.getTitleId());
+            reportInfoSettingTitleValuePo.setValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_valueId));
+            reportInfoSettingTitleValuePo.setCommunityId(inspectionItemTitlePo.getCommunityId());
+            inspectionItemTitleValueV1InnerServiceSMOImpl.saveInspectionItemTitleValue(reportInfoSettingTitleValuePo);
+        }
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-community/src/main/java/com/java110/community/cmd/inspectionItemTitle/UpdateInspectionItemTitleCmd.java

@@ -15,6 +15,7 @@
  */
 package com.java110.community.cmd.inspectionItemTitle;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
@@ -22,15 +23,18 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.AbstractServiceCmdListener;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.inspectionItemTitle.InspectionItemTitleDto;
 import com.java110.intf.community.IInspectionItemTitleV1InnerServiceSMO;
+import com.java110.intf.community.IInspectionItemTitleValueV1InnerServiceSMO;
 import com.java110.po.inspectionItemTitle.InspectionItemTitlePo;
+import com.java110.po.inspectionItemTitleValue.InspectionItemTitleValuePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 
 
 /**
@@ -46,30 +50,62 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "inspectionItemTitle.updateInspectionItemTitle")
 public class UpdateInspectionItemTitleCmd extends AbstractServiceCmdListener {
 
-  private static Logger logger = LoggerFactory.getLogger(UpdateInspectionItemTitleCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(UpdateInspectionItemTitleCmd.class);
 
 
     @Autowired
     private IInspectionItemTitleV1InnerServiceSMO inspectionItemTitleV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IInspectionItemTitleValueV1InnerServiceSMO inspectionItemTitleValueV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "titleId", "titleId不能为空");
-Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
-
+        Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空");
+        JSONArray titleValues = null;
+        if (!InspectionItemTitleDto.TITLE_TYPE_QUESTIONS.equals(reqJson.getString("titleType"))) {
+            titleValues = reqJson.getJSONArray("titleValues");
+            if (titleValues.size() < 1) {
+                throw new IllegalArgumentException("未包含选项");
+            }
+        }
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       InspectionItemTitlePo inspectionItemTitlePo = BeanConvertUtil.covertBean(reqJson, InspectionItemTitlePo.class);
+        InspectionItemTitlePo inspectionItemTitlePo = BeanConvertUtil.covertBean(reqJson, InspectionItemTitlePo.class);
         int flag = inspectionItemTitleV1InnerServiceSMOImpl.updateInspectionItemTitle(inspectionItemTitlePo);
 
         if (flag < 1) {
             throw new CmdException("更新数据失败");
         }
 
+        if (InspectionItemTitleDto.TITLE_TYPE_QUESTIONS.equals(inspectionItemTitlePo.getTitleType())) {
+            cmdDataFlowContext.setResponseEntity(ResultVo.success());
+            return;
+        }
+        InspectionItemTitleValuePo deleteInspectionItemTitleValuePo = new InspectionItemTitleValuePo();
+        deleteInspectionItemTitleValuePo.setTitleId(inspectionItemTitlePo.getTitleId());
+        flag = inspectionItemTitleValueV1InnerServiceSMOImpl.deleteInspectionItemTitleValue(deleteInspectionItemTitleValuePo);
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
+
+        JSONArray titleValues = reqJson.getJSONArray("titleValues");
+        InspectionItemTitleValuePo reportInfoSettingTitleValuePo = null;
+        for (int titleValueIndex = 0; titleValueIndex < titleValues.size(); titleValueIndex++) {
+            reportInfoSettingTitleValuePo = new InspectionItemTitleValuePo();
+            reportInfoSettingTitleValuePo.setItemValue(titleValues.getJSONObject(titleValueIndex).getString("itemValue"));
+            reportInfoSettingTitleValuePo.setSeq(titleValues.getJSONObject(titleValueIndex).getString("seq"));
+            reportInfoSettingTitleValuePo.setTitleId(inspectionItemTitlePo.getTitleId());
+            reportInfoSettingTitleValuePo.setValueId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_valueId));
+            reportInfoSettingTitleValuePo.setCommunityId(inspectionItemTitlePo.getCommunityId());
+            inspectionItemTitleValueV1InnerServiceSMOImpl.saveInspectionItemTitleValue(reportInfoSettingTitleValuePo);
+        }
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }