排班功能开发完成

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/DeleteScheduleClassesCmd.java

@@ -31,6 +31,7 @@ import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
 /**
  * 类表述：删除
  * 服务编码：scheduleClasses.deleteScheduleClasses
@@ -43,7 +44,7 @@ import org.slf4j.LoggerFactory;
  */
 @Java110Cmd(serviceCode = "scheduleClasses.deleteScheduleClasses")
 public class DeleteScheduleClassesCmd extends Cmd {
-  private static Logger logger = LoggerFactory.getLogger(DeleteScheduleClassesCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(DeleteScheduleClassesCmd.class);
 
     @Autowired
     private IScheduleClassesV1InnerServiceSMO scheduleClassesV1InnerServiceSMOImpl;
@@ -51,7 +52,6 @@ public class DeleteScheduleClassesCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "scheduleId", "scheduleId不能为空");
-Assert.hasKeyAndValue(reqJson, "scheduleId", "scheduleId不能为空");
 
     }
 
@@ -59,7 +59,7 @@ Assert.hasKeyAndValue(reqJson, "scheduleId", "scheduleId不能为空");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       ScheduleClassesPo scheduleClassesPo = BeanConvertUtil.covertBean(reqJson, ScheduleClassesPo.class);
+        ScheduleClassesPo scheduleClassesPo = BeanConvertUtil.covertBean(reqJson, ScheduleClassesPo.class);
         int flag = scheduleClassesV1InnerServiceSMOImpl.deleteScheduleClasses(scheduleClassesPo);
 
         if (flag < 1) {

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/DeleteScheduleClassesStaffCmd.java

@@ -50,7 +50,7 @@ public class DeleteScheduleClassesStaffCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "scsId", "scsId不能为空");
-Assert.hasKeyAndValue(reqJson, "scheduleId", "scheduleId不能为空");
+        Assert.hasKeyAndValue(reqJson, "scheduleId", "scheduleId不能为空");
 
     }
 

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/SaveScheduleClassesCmd.java

@@ -55,9 +55,8 @@ public class SaveScheduleClassesCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "name", "请求报文中未包含name");
-Assert.hasKeyAndValue(reqJson, "scheduleType", "请求报文中未包含scheduleType");
-Assert.hasKeyAndValue(reqJson, "scheduleCycle", "请求报文中未包含scheduleCycle");
-Assert.hasKeyAndValue(reqJson, "computeTime", "请求报文中未包含computeTime");
+        Assert.hasKeyAndValue(reqJson, "scheduleType", "请求报文中未包含scheduleType");
+        Assert.hasKeyAndValue(reqJson, "scheduleCycle", "请求报文中未包含scheduleCycle");
 
     }
 
@@ -65,7 +64,7 @@ Assert.hasKeyAndValue(reqJson, "computeTime", "请求报文中未包含computeTi
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       ScheduleClassesPo scheduleClassesPo = BeanConvertUtil.covertBean(reqJson, ScheduleClassesPo.class);
+        ScheduleClassesPo scheduleClassesPo = BeanConvertUtil.covertBean(reqJson, ScheduleClassesPo.class);
         scheduleClassesPo.setScheduleId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = scheduleClassesV1InnerServiceSMOImpl.saveScheduleClasses(scheduleClassesPo);
 

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/SaveScheduleClassesStaffCmd.java

@@ -55,9 +55,8 @@ public class SaveScheduleClassesStaffCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "scheduleId", "请求报文中未包含scheduleId");
-Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
-Assert.hasKeyAndValue(reqJson, "staffId", "请求报文中未包含staffId");
-Assert.hasKeyAndValue(reqJson, "staffName", "请求报文中未包含staffName");
+        Assert.hasKeyAndValue(reqJson, "staffId", "请求报文中未包含staffId");
+        Assert.hasKeyAndValue(reqJson, "staffName", "请求报文中未包含staffName");
 
     }
 
@@ -65,8 +64,11 @@ Assert.hasKeyAndValue(reqJson, "staffName", "请求报文中未包含staffName")
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       ScheduleClassesStaffPo scheduleClassesStaffPo = BeanConvertUtil.covertBean(reqJson, ScheduleClassesStaffPo.class);
+        String storeId = cmdDataFlowContext.getReqHeaders().get("store-id");
+
+        ScheduleClassesStaffPo scheduleClassesStaffPo = BeanConvertUtil.covertBean(reqJson, ScheduleClassesStaffPo.class);
         scheduleClassesStaffPo.setScsId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
+        scheduleClassesStaffPo.setStoreId(storeId);
         int flag = scheduleClassesStaffV1InnerServiceSMOImpl.saveScheduleClassesStaff(scheduleClassesStaffPo);
 
         if (flag < 1) {

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/UpdateScheduleClassesCmd.java

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

service-store/src/main/java/com/java110/store/cmd/scheduleClasses/UpdateScheduleClassesStaffCmd.java

@@ -1,74 +0,0 @@
-/*
- * Copyright 2017-2020 吴学文 and java110 team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.java110.store.cmd.scheduleClasses;
-
-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.intf.store.IScheduleClassesStaffV1InnerServiceSMO;
-import com.java110.po.scheduleClassesStaff.ScheduleClassesStaffPo;
-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;
-
-
-/**
- * 类表述：更新
- * 服务编码：scheduleClassesStaff.updateScheduleClassesStaff
- * 请求路劲：/app/scheduleClassesStaff.UpdateScheduleClassesStaff
- * add by 吴学文 at 2022-10-29 16:16:44 mail: 928255095@qq.com
- * open source address: https://gitee.com/wuxw7/MicroCommunity
- * 官网：http://www.homecommunity.cn
- * 温馨提示：如果您对此文件进行修改 请不要删除原有作者及注释信息，请补充您的 修改的原因以及联系邮箱如下
- * // modify by 张三 at 2021-09-12 第10行在某种场景下存在某种bug 需要修复，注释10至20行 加入 20行至30行
- */
-@Java110Cmd(serviceCode = "scheduleClasses.updateScheduleClassesStaff")
-public class UpdateScheduleClassesStaffCmd extends Cmd {
-
-  private static Logger logger = LoggerFactory.getLogger(UpdateScheduleClassesStaffCmd.class);
-
-
-    @Autowired
-    private IScheduleClassesStaffV1InnerServiceSMO scheduleClassesStaffV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "scsId", "scsId不能为空");
-Assert.hasKeyAndValue(reqJson, "scheduleId", "scheduleId不能为空");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       ScheduleClassesStaffPo scheduleClassesStaffPo = BeanConvertUtil.covertBean(reqJson, ScheduleClassesStaffPo.class);
-        int flag = scheduleClassesStaffV1InnerServiceSMOImpl.updateScheduleClassesStaff(scheduleClassesStaffPo);
-
-        if (flag < 1) {
-            throw new CmdException("更新数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}