Merge remote-tracking branch 'origin/master'

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/dao/AspSafetyDrillProgrammeDao.java

@@ -0,0 +1,16 @@
+package com.rongwei.sfcommon.sys.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.rongwe.scentity.domian.AspSafetyDrillProgrammeDo;
+
+/**
+ * <p>
+ * 安全应急-演练方案 Mapper 接口
+ * </p>
+ *
+ * @author wm
+ * @since 2023-11-13
+ */
+public interface AspSafetyDrillProgrammeDao extends BaseMapper<AspSafetyDrillProgrammeDo> {
+
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/AspSafetyDrillProgrammeService.java

@@ -0,0 +1,22 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwe.scentity.domian.AspSafetyDrillProgrammeDo;
+
+/**
+ * <p>
+ * 安全应急-演练方案 服务类
+ * </p>
+ *
+ * @author wm
+ * @since 2023-11-13
+ */
+public interface AspSafetyDrillProgrammeService extends IService<AspSafetyDrillProgrammeDo> {
+
+    /**
+     * 发布演练方案（定时处理）
+     *
+     */
+    void publish();
+
+}

cx-safe-check/cx-save-check-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/AspSafetyDrillProgrammeServiceImpl.java

@@ -0,0 +1,54 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwe.scentity.domian.AspSafetyDrillProgrammeDo;
+import com.rongwei.sfcommon.sys.dao.AspSafetyDrillProgrammeDao;
+import com.rongwei.sfcommon.sys.service.AspSafetyDrillProgrammeService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 安全应急-演练方案 服务实现类
+ * </p>
+ *
+ * @author wm
+ * @since 2023-11-13
+ */
+@Service
+public class AspSafetyDrillProgrammeServiceImpl extends ServiceImpl<AspSafetyDrillProgrammeDao, AspSafetyDrillProgrammeDo> implements AspSafetyDrillProgrammeService {
+
+    /**
+     * 发布演练方案（定时处理）
+     */
+    @Override
+    public void publish() {
+
+        //找出所有未演练状态的演练方案
+        LambdaQueryWrapper<AspSafetyDrillProgrammeDo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(AspSafetyDrillProgrammeDo::getDrillstatus, "20");
+
+        queryWrapper.apply("DAY( DRILLTIME ) = DAY (NOW())");
+
+        List<AspSafetyDrillProgrammeDo> list = list(queryWrapper);
+
+        if(ObjectUtil.isEmpty(list)) {
+            return ;
+        }
+
+        List<AspSafetyDrillProgrammeDo> updateList = new ArrayList<>(list.size());
+        list.forEach(item -> {
+            AspSafetyDrillProgrammeDo entity = new AspSafetyDrillProgrammeDo();
+            entity.setId(item.getId());
+            entity.setDrillstatus("30");
+            updateList.add(entity);
+        });
+
+        this.updateBatchById(updateList);
+    }
+}

cx-safe-check/cx-save-check-entity/src/main/java/com/rongwe/scentity/domian/AspSafetyDrillProgrammeDo.java

@@ -0,0 +1,252 @@
+package com.rongwe.scentity.domian;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 安全应急-演练方案
+ * </p>
+ *
+ * @author wm
+ * @since 2023-11-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("asp_safety_drill_programme")
+public class AspSafetyDrillProgrammeDo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键
+     */
+    @TableId("ID")
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    @TableField("TENANTID")
+    private String tenantid;
+
+    /**
+     * 扩展预留
+     */
+    @TableField("ROPTION")
+    private String roption;
+
+    /**
+     * 删除标记
+     */
+    @TableField("DELETED")
+    private String deleted;
+
+    /**
+     * 备注
+     */
+    @TableField("REMARK")
+    private String remark;
+
+    /**
+     * 创建人ID
+     */
+    @TableField("CREATEUSERID")
+    private String createuserid;
+
+    /**
+     * 创建人姓名
+     */
+    @TableField("CREATEUSERNAME")
+    private String createusername;
+
+    /**
+     * 创建日期
+     */
+    @TableField("CREATEDATE")
+    private Date createdate;
+
+    /**
+     * 修改人ID
+     */
+    @TableField("MODIFYUSERID")
+    private String modifyuserid;
+
+    /**
+     * 修改人姓名
+     */
+    @TableField("MODIFYUSERNAME")
+    private String modifyusername;
+
+    /**
+     * 修改日期
+     */
+    @TableField("MODIFYDATE")
+    private Date modifydate;
+
+    /**
+     * 组织ID
+     */
+    @TableField("ORGID")
+    private String orgid;
+
+    /**
+     * 预案ID
+     */
+    @TableField("PLANID")
+    private String planid;
+
+    /**
+     * 预案编码
+     */
+    @TableField("PLANCODE")
+    private String plancode;
+
+    /**
+     * 预案名称
+     */
+    @TableField("PLANNAME")
+    private String planname;
+
+    /**
+     * 演练编号
+     */
+    @TableField("DRILLCODE")
+    private String drillcode;
+
+    /**
+     * 演练地点
+     */
+    @TableField("DRILLLOCATION")
+    private String drilllocation;
+
+    /**
+     * 演练时间
+     */
+    @TableField("DRILLTIME")
+    private Date drilltime;
+
+    /**
+     * 演练类型
+     */
+    @TableField("DRILLTYPE")
+    private String drilltype;
+
+    /**
+     * 演练状态
+     */
+    @TableField("DRILLSTATUS")
+    private String drillstatus;
+
+    /**
+     * 评估状态
+     */
+    @TableField("EVALUATESTATUS")
+    private String evaluatestatus;
+
+    /**
+     * 组织部门ID
+     */
+    @TableField("DEPTID")
+    private String deptid;
+
+    /**
+     * 组织部门名称
+     */
+    @TableField("DEPTNAME")
+    private String deptname;
+
+    /**
+     * 摄像人员ID
+     */
+    @TableField("CAMERACREWID")
+    private String cameracrewid;
+
+    /**
+     * 摄像人员名称
+     */
+    @TableField("CAMERACREWNAME")
+    private String cameracrewname;
+
+    /**
+     * 演练内容
+     */
+    @TableField("DRILLCONTENT")
+    private String drillcontent;
+
+    /**
+     * 准备工作
+     */
+    @TableField("PREPARATION")
+    private String preparation;
+
+    /**
+     * 观摩人员ID
+     */
+    @TableField("OBSERVERIDS")
+    private String observerids;
+
+    /**
+     * 观摩人员名称
+     */
+    @TableField("OBSERVERNAMES")
+    private String observernames;
+
+    /**
+     * 演练目的
+     */
+    @TableField("DRILLOBJECTIVE")
+    private String drillobjective;
+
+    /**
+     * 参演人员ID
+     */
+    @TableField("PARTICIPANTID")
+    private String participantid;
+
+    /**
+     * 参演人员名称
+     */
+    @TableField("PARTICIPANTNAME")
+    private String participantname;
+
+    /**
+     * 演练动员、培训
+     */
+    @TableField("MOBILIZATIONTRAINING")
+    private String mobilizationtraining;
+
+    /**
+     * 演练流程
+     */
+    @TableField("DRILLPROCESS")
+    private String drillprocess;
+
+    /**
+     * 演练评估总结
+     */
+    @TableField("EVALUATIONSUMMARY")
+    private String evaluationsummary;
+
+    /**
+     * 逃生路线
+     */
+    @TableField("ESCAPEROUTE")
+    private String escaperoute;
+
+    /**
+     * 发布状态
+     */
+    @TableField("PUBLISHSTATUS")
+    private String publishstatus;
+
+
+}

cx-safe-check/cx-save-check-server/src/main/java/com/rongwei/savecheck/controller/AspSafetyDrillProgrammeController.java

@@ -0,0 +1,37 @@
+package com.rongwei.savecheck.controller;
+
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.sfcommon.sys.service.AspSafetyDrillProgrammeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 安全应急-演练方案 前端控制器
+ * </p>
+ *
+ * @author wm
+ * @since 2023-11-13
+ */
+@RestController
+@RequestMapping("/asp/safety/drill")
+public class AspSafetyDrillProgrammeController {
+
+    @Autowired
+    private AspSafetyDrillProgrammeService aspSafetyDrillProgrammeService;
+
+    /**
+     * 发布演练方案
+     *
+     * @return
+     */
+    @PostMapping("/publish")
+    public R publish(){
+        aspSafetyDrillProgrammeService.publish();
+        return R.ok();
+    }
+
+}
+