feature 代码提交

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/SpecialInspectionService.java

@@ -0,0 +1,13 @@
+package com.rongwei.sfcommon.sys.service;
+
+import com.rongwei.rwcommon.base.R;
+
+/**
+ * SpecialInspectionService class
+ *
+ * @author XH
+ * @date 2024/08/20
+ */
+public interface SpecialInspectionService {
+    R createHiddenDangerTrack(String id);
+}

js-security/security-common/src/main/java/com/rongwei/sfcommon/sys/service/impl/SpecialInspectionServiceImpl.java

@@ -0,0 +1,30 @@
+package com.rongwei.sfcommon.sys.service.impl;
+
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.sfcommon.sys.service.SpecialInspectionService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+/**
+ * SpecialInspectionServiceImpl class
+ *
+ * @author XH
+ * @date 2024/08/20
+ */
+@Service
+public class SpecialInspectionServiceImpl implements SpecialInspectionService {
+    private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
+
+    /**
+     * 专项检查生成隐患任务
+     * @param id
+     * @return
+     */
+    @Override
+    public R createHiddenDangerTrack(String id) {
+        log.info("开始根据专项检查任务：{}生成隐患任务",id);
+
+        return null;
+    }
+}

js-security/security-server/src/main/java/com/rongwei/savecheck/controller/SpecialInspectionController.java

@@ -0,0 +1,36 @@
+package com.rongwei.savecheck.controller;
+
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.sfcommon.sys.service.impl.SpecialInspectionServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * SpecialInspectionController class
+ *
+ * @author XH
+ * @date 2024/08/20
+ */
+@RestController
+@RequestMapping("/special/inspection")
+public class SpecialInspectionController {
+    private final Logger log = LoggerFactory.getLogger(this.getClass().getName());
+    @Autowired
+    private SpecialInspectionServiceImpl specialInspectionService;
+    /**
+     * 生成隐患排查任务
+     *
+     * @param map
+     * @return
+     */
+    @GetMapping("/create/task/{id}")
+    public R createTask(@PathVariable(name = "id") String id) {
+        log.info("根据模板: {}生成隐患排查任务", id);
+        return specialInspectionService.createHiddenDangerTrack(id);
+    }
+}

js-security/security-server/src/main/resources/logback-spring.xml

@@ -11,26 +11,18 @@
     <!--按天生成日志-->
     <appender name="logFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <Prudent>true</Prudent>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>
-                icsavechecklog/%d{yyyy-MM-dd}/%d{yyyy-MM-dd}.log
-            </FileNamePattern>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>icsavechecklog/%d{yyyy-MM-dd}/savecheck.%i.log</fileNamePattern>
+            <maxFileSize>5mb</maxFileSize>
+            <maxHistory>3</maxHistory>
+            <totalSizeCap>300MB</totalSizeCap>
         </rollingPolicy>
-        <layout class="ch.qos.logback.classic.PatternLayout">
-            <Pattern>
-                %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level -%msg%n
-            </Pattern>
-        </layout>
+        <encoder>
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
     </appender>
-
-    <logger name="com.bootdo" additivity="false">
-        <appender-ref ref="console"/>
-        <appender-ref ref="logFile"/>
-    </logger>
-
     <root level="error">
         <appender-ref ref="console"/>
         <appender-ref ref="logFile"/>
     </root>
-
 </configuration>

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/dao/ApsSpecialInspectionTaskDao.java

@@ -0,0 +1,15 @@
+package com.rongwei.trainingcommon.sys.dao;
+
+import com.rongwei.training.domain.ApsSpecialInspectionTaskDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Entity generator.domain.ApsSpecialInspectionTask
+ */
+public interface ApsSpecialInspectionTaskDao extends BaseMapper<ApsSpecialInspectionTaskDo> {
+
+}
+
+
+
+

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/dao/ApsSpecialInspectionTaskZibiaoDao.java

@@ -0,0 +1,15 @@
+package com.rongwei.trainingcommon.sys.dao;
+
+import com.rongwei.training.domain.ApsSpecialInspectionTaskZibiaoDo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Entity generator.domain.ApsSpecialInspectionTaskZibiao
+ */
+public interface ApsSpecialInspectionTaskZibiaoDao extends BaseMapper<ApsSpecialInspectionTaskZibiaoDo> {
+
+}
+
+
+
+

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/ApsSpecialInspectionTaskService.java

@@ -0,0 +1,11 @@
+package com.rongwei.trainingcommon.sys.service;
+
+import com.rongwei.training.domain.ApsSpecialInspectionTaskDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ */
+public interface ApsSpecialInspectionTaskService extends IService<ApsSpecialInspectionTaskDo> {
+
+}

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/ApsSpecialInspectionTaskZibiaoService.java

@@ -0,0 +1,11 @@
+package com.rongwei.trainingcommon.sys.service;
+
+import com.rongwei.training.domain.ApsSpecialInspectionTaskZibiaoDo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ *
+ */
+public interface ApsSpecialInspectionTaskZibiaoService extends IService<ApsSpecialInspectionTaskZibiaoDo> {
+
+}

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/ApsSpecialInspectionTaskServiceImpl.java

@@ -0,0 +1,21 @@
+package com.rongwei.trainingcommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.training.domain.ApsSpecialInspectionTaskDo;
+import com.rongwei.trainingcommon.sys.dao.ApsSpecialInspectionTaskDao;
+
+import com.rongwei.trainingcommon.sys.service.ApsSpecialInspectionTaskService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsSpecialInspectionTaskServiceImpl extends ServiceImpl<ApsSpecialInspectionTaskDao, ApsSpecialInspectionTaskDo>
+implements ApsSpecialInspectionTaskService {
+
+}
+
+
+
+

js-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/ApsSpecialInspectionTaskZibiaoServiceImpl.java

@@ -0,0 +1,20 @@
+package com.rongwei.trainingcommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.rongwei.training.domain.ApsSpecialInspectionTaskZibiaoDo;
+import com.rongwei.trainingcommon.sys.dao.ApsSpecialInspectionTaskZibiaoDao;
+import com.rongwei.trainingcommon.sys.service.ApsSpecialInspectionTaskZibiaoService;
+import org.springframework.stereotype.Service;
+
+/**
+ *
+ */
+@Service
+public class ApsSpecialInspectionTaskZibiaoServiceImpl extends ServiceImpl<ApsSpecialInspectionTaskZibiaoDao, ApsSpecialInspectionTaskZibiaoDo>
+implements ApsSpecialInspectionTaskZibiaoService {
+
+}
+
+
+
+

js-training/training-entity/src/main/java/com/rongwei/training/domain/ApsSpecialInspectionTaskDo.java

@@ -0,0 +1,107 @@
+package com.rongwei.training.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 专项检查任务
+ * @TableName aps_special_inspection_task
+ */
+@TableName(value ="aps_special_inspection_task")
+@Data
+public class ApsSpecialInspectionTaskDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 企业名称
+     */
+    private String companyname;
+
+    /**
+     * 企业编码
+     */
+    private String companycode;
+
+    /**
+     * 任务类型
+     */
+    private String tasktypename;
+
+    /**
+     * 任务开始时间 
+     */
+    private Date taskstarttime;
+
+    /**
+     * 任务结束时间
+     */
+    private Date taskendtime;
+
+    /**
+     * 任务状态
+     */
+    private String taskstate;
+
+    /**
+     * 任务描述
+     */
+    private String taskcontent;
+
+    /**
+     * 检查人
+     */
+    private String inspector;
+
+    /**
+     * 计划检查时间
+     */
+    private Date plannedinspectiontime;
+
+    /**
+     * 检查时间
+     */
+    private Date checkdate;
+
+    /**
+     * 危险源编码
+     */
+    private String hazardcode;
+
+    /**
+     * 检查类型
+     */
+    private String checktype;
+
+    /**
+     * 是否停厂整顿
+     */
+    private String resultstatus;
+
+    /**
+     * 任务名称
+     */
+    private String taskname;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

js-training/training-entity/src/main/java/com/rongwei/training/domain/ApsSpecialInspectionTaskZibiaoDo.java

@@ -0,0 +1,82 @@
+package com.rongwei.training.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.rongwei.rwcommon.base.BaseDo;
+import lombok.Data;
+
+/**
+ * 专项检查任务
+ * @TableName aps_special_inspection_task_zibiao
+ */
+@TableName(value ="aps_special_inspection_task_zibiao")
+@Data
+public class ApsSpecialInspectionTaskZibiaoDo extends BaseDo implements Serializable {
+    /**
+     * 主键ID
+     */
+    @TableId
+    private String id;
+
+    /**
+     * 租户ID
+     */
+    private String tenantid;
+
+    /**
+     * 扩展json格式配置
+     */
+    private String roption;
+
+    /**
+     * 主表 id
+     */
+    private String madinid;
+
+    /**
+     * 检查序号
+     */
+    private String checkname;
+
+    /**
+     * 检查内容
+     */
+    private String checkcontent;
+
+    /**
+     * 检查方式
+     */
+    private String checkway;
+
+    /**
+     * 检查依据
+     */
+    private String checkbasis;
+
+    /**
+     * 适用场合
+     */
+    private String applicableplace;
+
+    /**
+     * 是否为否决项
+     */
+    private String isreject;
+
+    /**
+     * 扣分分值
+     */
+    private Integer deductpoint;
+
+    /**
+     * 扣分说明
+     */
+    private String deductillustrate;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}

js-training/training-server/src/main/resources/logback-spring.xml

@@ -11,10 +11,11 @@
     <!--按天生成日志-->
     <appender name="logFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <Prudent>true</Prudent>
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <FileNamePattern>
-                ictraininglog/%d{yyyy-MM-dd}/%d{yyyy-MM-dd}.log
-            </FileNamePattern>
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <fileNamePattern>icsavechecklog/%d{yyyy-MM-dd}/training.%i.log</fileNamePattern>
+            <maxFileSize>5mb</maxFileSize>
+            <maxHistory>3</maxHistory>
+            <totalSizeCap>300MB</totalSizeCap>
         </rollingPolicy>
         <layout class="ch.qos.logback.classic.PatternLayout">
             <Pattern>
@@ -22,15 +23,8 @@
             </Pattern>
         </layout>
     </appender>
-
-    <logger name="com.incontrol" additivity="false">
-        <appender-ref ref="console"/>
-        <appender-ref ref="logFile"/>
-    </logger>
-
     <root level="error">
         <appender-ref ref="console"/>
         <appender-ref ref="logFile"/>
     </root>
-
 </configuration>