From a13573d5ef8d16f4bc2535a3c89c2891e6f5b56c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 15:33:30 +0800
Subject: [PATCH] optimize

---
 service-store/src/main/java/com/java110/store/cmd/scheduleClasses/SaveScheduleClassesCmd.java |   36 ++++++++++--------------------------
 1 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/service-store/src/main/java/com/java110/store/cmd/scheduleClasses/SaveScheduleClassesCmd.java b/service-store/src/main/java/com/java110/store/cmd/scheduleClasses/SaveScheduleClassesCmd.java
index 4fa37a8..6f710ca 100644
--- a/service-store/src/main/java/com/java110/store/cmd/scheduleClasses/SaveScheduleClassesCmd.java
+++ b/service-store/src/main/java/com/java110/store/cmd/scheduleClasses/SaveScheduleClassesCmd.java
@@ -24,7 +24,7 @@
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
 import com.java110.dto.scheduleClasses.ScheduleClassesDto;
-import com.java110.dto.scheduleClassesDay.ScheduleClassesDayDto;
+import com.java110.dto.scheduleClasses.ScheduleClassesDayDto;
 import com.java110.intf.store.IScheduleClassesDayV1InnerServiceSMO;
 import com.java110.intf.store.IScheduleClassesTimeV1InnerServiceSMO;
 import com.java110.intf.store.IScheduleClassesV1InnerServiceSMO;
@@ -72,76 +72,63 @@
         Assert.hasKeyAndValue(reqJson, "name", "璇锋眰鎶ユ枃涓湭鍖呭惈name");
         Assert.hasKeyAndValue(reqJson, "scheduleType", "璇锋眰鎶ユ枃涓湭鍖呭惈scheduleType");
         Assert.hasKeyAndValue(reqJson, "scheduleCycle", "璇锋眰鎶ユ枃涓湭鍖呭惈scheduleCycle");
-
-        if(!reqJson.containsKey("days")){
+        if (!reqJson.containsKey("days")) {
             throw new CmdException("鏈寘鍚ぉ");
         }
-
         JSONArray days = reqJson.getJSONArray("days");
-
-        if(days.size() <1){
+        if (days.size() < 1) {
             throw new CmdException("鏈寘鍚ぉ");
         }
-
-
         JSONObject day = null;
         JSONArray times = null;
-        for(int dayIndex = 0 ; dayIndex < days.size(); dayIndex++){
+        for (int dayIndex = 0; dayIndex < days.size(); dayIndex++) {
             day = days.getJSONObject(dayIndex);
-
-            if(!ScheduleClassesDayDto.WORKDAY_NORMAL.equals(day.getString("workday"))){
+            if (ScheduleClassesDayDto.WORKDAY_NO.equals(day.getString("workday"))) {
                 continue;
             }
-            if(!day.containsKey("times")){
+            if (!day.containsKey("times")) {
                 throw new CmdException("鏈寘鏃堕棿");
             }
             times = day.getJSONArray("times");
-            if(times.size() <1){
+            if (times.size() < 1) {
                 throw new CmdException("鏈寘鏃堕棿");
             }
-
         }
-
     }
 
     @Override
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
         String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
-
         ScheduleClassesPo scheduleClassesPo = BeanConvertUtil.covertBean(reqJson, ScheduleClassesPo.class);
         scheduleClassesPo.setScheduleId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         scheduleClassesPo.setStoreId(storeId);
         scheduleClassesPo.setState(ScheduleClassesDto.STATE_START);
         scheduleClassesPo.setComputeTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
         int flag = scheduleClassesV1InnerServiceSMOImpl.saveScheduleClasses(scheduleClassesPo);
-
         if (flag < 1) {
             throw new CmdException("淇濆瓨鏁版嵁澶辫触");
         }
-
         JSONArray days = reqJson.getJSONArray("days");
-
         JSONObject day = null;
         ScheduleClassesDayPo scheduleClassesDayPo = null;
         JSONObject time = null;
         ScheduleClassesTimePo scheduleClassesTimePo = null;
         JSONArray times = null;
-        for(int dayIndex = 0 ; dayIndex < days.size(); dayIndex++){
+        for (int dayIndex = 0; dayIndex < days.size(); dayIndex++) {
             day = days.getJSONObject(dayIndex);
             scheduleClassesDayPo = new ScheduleClassesDayPo();
             scheduleClassesDayPo.setDayId(GenerateCodeFactory.getGeneratorId("11"));
             scheduleClassesDayPo.setDay(day.getString("day"));
             scheduleClassesDayPo.setScheduleId(scheduleClassesPo.getScheduleId());
-            scheduleClassesDayPo.setWeekFlag(StringUtil.isEmpty(day.getString("weekFlag"))?"1":day.getString("weekFlag"));
+            scheduleClassesDayPo.setWeekFlag(StringUtil.isEmpty(day.getString("weekFlag")) ? "1" : day.getString("weekFlag"));
             scheduleClassesDayPo.setWorkday(day.getString("workday"));
             flag = scheduleClassesDayV1InnerServiceSMOImpl.saveScheduleClassesDay(scheduleClassesDayPo);
             if (flag < 1) {
                 throw new CmdException("淇濆瓨鏁版嵁澶辫触");
             }
             times = day.getJSONArray("times");
-            for(int timeIndex = 0 ;timeIndex < times.size();timeIndex++){
+            for (int timeIndex = 0; timeIndex < times.size(); timeIndex++) {
                 time = times.getJSONObject(timeIndex);
                 scheduleClassesTimePo = new ScheduleClassesTimePo();
                 scheduleClassesTimePo.setDayId(scheduleClassesDayPo.getDayId());
@@ -155,9 +142,6 @@
                 }
             }
         }
-
-
-
         cmdDataFlowContext.setResponseEntity(ResultVo.success());
     }
 }

--
Gitblit v1.8.0