优化班次功能

java110-db/src/main/resources/mapper/store/ClassesTimeV1ServiceDaoImplMapper.xml

@@ -50,9 +50,7 @@
         <if test="newBId != null and newBId != ''">
             ,t.b_id = #{newBId}
         </if>
-        <if test="classesId !=null and classesId != ''">
-            , t.classes_id= #{classesId}
-        </if>
+
         <if test="startTime !=null and startTime != ''">
             , t.start_time= #{startTime}
         </if>
@@ -63,6 +61,9 @@
         <if test="timeId !=null and timeId != ''">
             and t.time_id= #{timeId}
         </if>
+        <if test="classesId !=null and classesId != ''">
+            and t.classes_id= #{classesId}
+        </if>
 
     </update>
 

java110-db/src/main/resources/mapper/store/ClassesV1ServiceDaoImplMapper.xml

@@ -18,7 +18,7 @@
     <!-- 查询班次信息 add by wuxw 2018-07-03 -->
     <select id="getClassesInfo" parameterType="Map" resultType="Map">
         select t.classes_id,t.classes_id classesId,t.name,t.remark,t.status_cd,t.status_cd
-        statusCd,t.state,t.store_id,t.store_id storeId
+        statusCd,t.state,t.store_id,t.store_id storeId,t.create_time createTime
         from classes t
         where 1 =1
         <if test="classesId !=null and classesId != ''">
@@ -62,13 +62,14 @@
         <if test="state !=null and state != ''">
             , t.state= #{state}
         </if>
-        <if test="storeId !=null and storeId != ''">
-            , t.store_id= #{storeId}
-        </if>
+
         where 1=1
         <if test="classesId !=null and classesId != ''">
             and t.classes_id= #{classesId}
         </if>
+        <if test="storeId !=null and storeId != ''">
+            and t.store_id= #{storeId}
+        </if>
 
     </update>
 

service-store/src/main/java/com/java110/store/cmd/classes/DeleteClassesCmd.java

@@ -51,7 +51,6 @@ public class DeleteClassesCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "classesId", "classesId不能为空");
-Assert.hasKeyAndValue(reqJson, "classesId", "classesId不能为空");
 
     }
 

service-store/src/main/java/com/java110/store/cmd/classes/SaveClassesCmd.java

@@ -15,6 +15,7 @@
  */
 package com.java110.store.cmd.classes;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
@@ -23,8 +24,10 @@ import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.classes.ClassesDto;
+import com.java110.intf.store.IClassesTimeV1InnerServiceSMO;
 import com.java110.intf.store.IClassesV1InnerServiceSMO;
 import com.java110.po.classes.ClassesPo;
+import com.java110.po.classesTime.ClassesTimePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -53,10 +56,23 @@ public class SaveClassesCmd extends Cmd {
     @Autowired
     private IClassesV1InnerServiceSMO classesV1InnerServiceSMOImpl;
 
+    @Autowired
+    private IClassesTimeV1InnerServiceSMO classesTimeV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "name", "请求报文中未包含name");
 
+        if(!reqJson.containsKey("times")){
+            throw new CmdException("未包含时间");
+        }
+
+        JSONArray times = reqJson.getJSONArray("times");
+
+        if(times.size() < 1){
+            throw new CmdException("未包含时间");
+        }
+
     }
 
     @Override
@@ -74,6 +90,22 @@ public class SaveClassesCmd extends Cmd {
             throw new CmdException("保存数据失败");
         }
 
+        JSONArray times = reqJson.getJSONArray("times");
+        JSONObject time = null;
+        ClassesTimePo classesTimePo = null;
+        for(int timeIndex = 0; timeIndex < times.size() ; timeIndex ++){
+            time = times.getJSONObject(timeIndex);
+            classesTimePo = new ClassesTimePo();
+            classesTimePo.setClassesId(classesPo.getClassesId());
+            classesTimePo.setStartTime(time.getString("startTime"));
+            classesTimePo.setEndTime(time.getString("endTime"));
+            classesTimePo.setTimeId(GenerateCodeFactory.getGeneratorId("11"));
+            flag = classesTimeV1InnerServiceSMOImpl.saveClassesTime(classesTimePo);
+            if (flag < 1) {
+                throw new CmdException("保存数据失败");
+            }
+        }
+
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

service-store/src/main/java/com/java110/store/cmd/classes/UpdateClassesCmd.java

@@ -15,6 +15,7 @@
  */
 package com.java110.store.cmd.classes;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.java110.core.annotation.Java110Cmd;
 import com.java110.core.annotation.Java110Transactional;
@@ -22,8 +23,10 @@ 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.intf.store.IClassesTimeV1InnerServiceSMO;
 import com.java110.intf.store.IClassesV1InnerServiceSMO;
 import com.java110.po.classes.ClassesPo;
+import com.java110.po.classesTime.ClassesTimePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
 import com.java110.utils.util.BeanConvertUtil;
@@ -52,11 +55,23 @@ public class UpdateClassesCmd extends Cmd {
     @Autowired
     private IClassesV1InnerServiceSMO classesV1InnerServiceSMOImpl;
 
+
+    @Autowired
+    private IClassesTimeV1InnerServiceSMO classesTimeV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "classesId", "classesId不能为空");
-Assert.hasKeyAndValue(reqJson, "classesId", "classesId不能为空");
 
+        if(!reqJson.containsKey("times")){
+            throw new CmdException("未包含时间");
+        }
+
+        JSONArray times = reqJson.getJSONArray("times");
+
+        if(times.size() < 1){
+            throw new CmdException("未包含时间");
+        }
     }
 
     @Override
@@ -69,6 +84,28 @@ Assert.hasKeyAndValue(reqJson, "classesId", "classesId不能为空");
         if (flag < 1) {
             throw new CmdException("更新数据失败");
         }
+        ClassesTimePo classesTimePo = null;
+        classesTimePo = new ClassesTimePo();
+        classesTimePo.setClassesId(classesPo.getClassesId());
+        flag = classesTimeV1InnerServiceSMOImpl.deleteClassesTime(classesTimePo);
+        if (flag < 1) {
+            throw new CmdException("更新数据失败");
+        }
+        JSONArray times = reqJson.getJSONArray("times");
+        JSONObject time = null;
+
+        for(int timeIndex = 0; timeIndex < times.size() ; timeIndex ++){
+            time = times.getJSONObject(timeIndex);
+            classesTimePo = new ClassesTimePo();
+            classesTimePo.setClassesId(classesPo.getClassesId());
+            classesTimePo.setStartTime(time.getString("startTime"));
+            classesTimePo.setEndTime(time.getString("endTime"));
+            classesTimePo.setTimeId(GenerateCodeFactory.getGeneratorId("11"));
+            flag = classesTimeV1InnerServiceSMOImpl.saveClassesTime(classesTimePo);
+            if (flag < 1) {
+                throw new CmdException("保存数据失败");
+            }
+        }
 
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }