保养任务 开发完成

java110-interface/src/main/java/com/java110/intf/community/IMaintainanceTaskV1InnerServiceSMO.java

@@ -67,8 +67,8 @@ public interface IMaintainanceTaskV1InnerServiceSMO {
     @RequestMapping(value = "/queryMaintainanceTasksCount", method = RequestMethod.POST)
     int queryMaintainanceTasksCount(@RequestBody MaintainanceTaskDto maintainanceTaskDto);
 
-    @RequestMapping(value = "/saveMaintainanceTask", method = RequestMethod.POST)
-    int saveMaintainanceTask(@RequestBody List<MaintainanceTaskPo> maintainanceTaskPos);
+    @RequestMapping(value = "/saveMaintainanceTasks", method = RequestMethod.POST)
+    int saveMaintainanceTasks(@RequestBody List<MaintainanceTaskPo> maintainanceTaskPos);
 
     @RequestMapping(value = "/saveMaintainanceTaskDetail", method = RequestMethod.POST)
     int saveMaintainanceTaskDetail(@RequestBody List<MaintainanceTaskDetailPo> maintainanceTaskDetailPos);

service-community/src/main/java/com/java110/community/cmd/maintainanceTask/SaveMaintainanceTaskCmd.java

@@ -1,80 +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.community.cmd.maintainanceTask;
-
-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.intf.community.IMaintainanceTaskV1InnerServiceSMO;
-import com.java110.po.maintainanceTask.MaintainanceTaskPo;
-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;
-
-/**
- * 类表述：保存
- * 服务编码：maintainanceTask.saveMaintainanceTask
- * 请求路劲：/app/maintainanceTask.SaveMaintainanceTask
- * add by 吴学文 at 2022-11-08 15:51:01 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 = "maintainanceTask.saveMaintainanceTask")
-public class SaveMaintainanceTaskCmd extends Cmd {
-
-    private static Logger logger = LoggerFactory.getLogger(SaveMaintainanceTaskCmd.class);
-
-    public static final String CODE_PREFIX_ID = "10";
-
-    @Autowired
-    private IMaintainanceTaskV1InnerServiceSMO maintainanceTaskV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-Assert.hasKeyAndValue(reqJson, "planId", "请求报文中未包含planId");
-Assert.hasKeyAndValue(reqJson, "planInsTime", "请求报文中未包含planInsTime");
-Assert.hasKeyAndValue(reqJson, "planUserId", "请求报文中未包含planUserId");
-Assert.hasKeyAndValue(reqJson, "mpsId", "请求报文中未包含mpsId");
-Assert.hasKeyAndValue(reqJson, "planEndTime", "请求报文中未包含planEndTime");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       MaintainanceTaskPo maintainanceTaskPo = BeanConvertUtil.covertBean(reqJson, MaintainanceTaskPo.class);
-        maintainanceTaskPo.setTaskId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = maintainanceTaskV1InnerServiceSMOImpl.saveMaintainanceTask(maintainanceTaskPo);
-
-        if (flag < 1) {
-            throw new CmdException("保存数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-community/src/main/java/com/java110/community/cmd/maintainanceTask/SaveMaintainanceTaskDetailCmd.java

@@ -1,79 +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.community.cmd.maintainanceTask;
-
-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.intf.community.IMaintainanceTaskDetailV1InnerServiceSMO;
-import com.java110.po.maintainanceTaskDetail.MaintainanceTaskDetailPo;
-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;
-
-/**
- * 类表述：保存
- * 服务编码：maintainanceTaskDetail.saveMaintainanceTaskDetail
- * 请求路劲：/app/maintainanceTaskDetail.SaveMaintainanceTaskDetail
- * add by 吴学文 at 2022-11-08 16:02:23 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 = "maintainanceTaskDetail.saveMaintainanceTaskDetail")
-public class SaveMaintainanceTaskDetailCmd extends Cmd {
-
-    private static Logger logger = LoggerFactory.getLogger(SaveMaintainanceTaskDetailCmd.class);
-
-    public static final String CODE_PREFIX_ID = "10";
-
-    @Autowired
-    private IMaintainanceTaskDetailV1InnerServiceSMO maintainanceTaskDetailV1InnerServiceSMOImpl;
-
-    @Override
-    public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
-        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
-Assert.hasKeyAndValue(reqJson, "taskId", "请求报文中未包含taskId");
-Assert.hasKeyAndValue(reqJson, "machineId", "请求报文中未包含machineId");
-Assert.hasKeyAndValue(reqJson, "machineName", "请求报文中未包含machineName");
-Assert.hasKeyAndValue(reqJson, "state", "请求报文中未包含state");
-
-    }
-
-    @Override
-    @Java110Transactional
-    public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
-
-       MaintainanceTaskDetailPo maintainanceTaskDetailPo = BeanConvertUtil.covertBean(reqJson, MaintainanceTaskDetailPo.class);
-        maintainanceTaskDetailPo.setTaskDetailId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
-        int flag = maintainanceTaskDetailV1InnerServiceSMOImpl.saveMaintainanceTaskDetail(maintainanceTaskDetailPo);
-
-        if (flag < 1) {
-            throw new CmdException("保存数据失败");
-        }
-
-        cmdDataFlowContext.setResponseEntity(ResultVo.success());
-    }
-}

service-community/src/main/java/com/java110/community/smo/impl/MaintainanceTaskV1InnerServiceSMOImpl.java

@@ -91,7 +91,7 @@ public class MaintainanceTaskV1InnerServiceSMOImpl extends BaseServiceSMO implem
 
 
     @Override
-    public int saveMaintainanceTask(@RequestBody List<MaintainanceTaskPo> maintainanceTaskPos) {
+    public int saveMaintainanceTasks(@RequestBody List<MaintainanceTaskPo> maintainanceTaskPos) {
         Map task = new HashMap();
         List<Map> list = new ArrayList<>();
         for (MaintainanceTaskPo maintainanceTaskpo : maintainanceTaskPos) {

service-job/src/main/java/com/java110/job/task/maintainance/GeneratorMaintainanceTaskTemplate.java

@@ -109,7 +109,7 @@ public class GeneratorMaintainanceTaskTemplate extends TaskSystemQuartz {
         if (maintainanceTaskDetailPos.size() < 1) {
             return;
         }
-        maintainanceTaskV1InnerServiceSMOImpl.saveMaintainanceTask(maintainanceTaskPos);
+        maintainanceTaskV1InnerServiceSMOImpl.saveMaintainanceTasks(maintainanceTaskPos);
 
         maintainanceTaskV1InnerServiceSMOImpl.saveMaintainanceTaskDetail(maintainanceTaskDetailPos);