diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
new file mode 100644
index 0000000..102b32f
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
@@ -0,0 +1,48 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员信息
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+@Data
+@TableName("casic_sanitation.dcms_person")
+public class DcmsPerson extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId("ID")
+ private Long id;
+
+ @TableField("SEX")
+ private String sex;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("TEL")
+ private String tel;
+
+ @TableField("RESPONSE_AREA")
+ private String responseArea;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
new file mode 100644
index 0000000..102b32f
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
@@ -0,0 +1,48 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员信息
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+@Data
+@TableName("casic_sanitation.dcms_person")
+public class DcmsPerson extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId("ID")
+ private Long id;
+
+ @TableField("SEX")
+ private String sex;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("TEL")
+ private String tel;
+
+ @TableField("RESPONSE_AREA")
+ private String responseArea;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
new file mode 100644
index 0000000..dba8765
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
@@ -0,0 +1,10 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+
+import java.util.List;
+
+public interface IDcmsPersonService extends IService {
+ List getPersonListByNameAndTel(String name, String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
new file mode 100644
index 0000000..102b32f
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
@@ -0,0 +1,48 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员信息
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+@Data
+@TableName("casic_sanitation.dcms_person")
+public class DcmsPerson extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId("ID")
+ private Long id;
+
+ @TableField("SEX")
+ private String sex;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("TEL")
+ private String tel;
+
+ @TableField("RESPONSE_AREA")
+ private String responseArea;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
new file mode 100644
index 0000000..dba8765
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
@@ -0,0 +1,10 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+
+import java.util.List;
+
+public interface IDcmsPersonService extends IService {
+ List getPersonListByNameAndTel(String name, String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
new file mode 100644
index 0000000..c067e61
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.DcmsPersonMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DcmsPersonServiceImpl extends ServiceImpl implements IDcmsPersonService {
+ @Override
+ public List getPersonListByNameAndTel(String name, String tel) {
+ return baseMapper.getPersonListByNameAndTel(name, tel);
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
new file mode 100644
index 0000000..102b32f
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
@@ -0,0 +1,48 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员信息
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+@Data
+@TableName("casic_sanitation.dcms_person")
+public class DcmsPerson extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId("ID")
+ private Long id;
+
+ @TableField("SEX")
+ private String sex;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("TEL")
+ private String tel;
+
+ @TableField("RESPONSE_AREA")
+ private String responseArea;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
new file mode 100644
index 0000000..dba8765
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
@@ -0,0 +1,10 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+
+import java.util.List;
+
+public interface IDcmsPersonService extends IService {
+ List getPersonListByNameAndTel(String name, String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
new file mode 100644
index 0000000..c067e61
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.DcmsPersonMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DcmsPersonServiceImpl extends ServiceImpl implements IDcmsPersonService {
+ @Override
+ public List getPersonListByNameAndTel(String name, String tel) {
+ return baseMapper.getPersonListByNameAndTel(name, tel);
+ }
+}
diff --git a/casic-service-toilet/pom.xml b/casic-service-toilet/pom.xml
index 6277bbc..8a0451e 100644
--- a/casic-service-toilet/pom.xml
+++ b/casic-service-toilet/pom.xml
@@ -34,6 +34,7 @@
1.0.0
compile
+
org.apache.poi
poi
@@ -50,6 +51,18 @@
3.17
+
+ com.xuxueli
+ xxl-job-core
+ 2.3.0
+
+
+
+ cn.hutool
+ hutool-all
+ 5.8.31
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
new file mode 100644
index 0000000..102b32f
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
@@ -0,0 +1,48 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员信息
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+@Data
+@TableName("casic_sanitation.dcms_person")
+public class DcmsPerson extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId("ID")
+ private Long id;
+
+ @TableField("SEX")
+ private String sex;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("TEL")
+ private String tel;
+
+ @TableField("RESPONSE_AREA")
+ private String responseArea;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
new file mode 100644
index 0000000..dba8765
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
@@ -0,0 +1,10 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+
+import java.util.List;
+
+public interface IDcmsPersonService extends IService {
+ List getPersonListByNameAndTel(String name, String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
new file mode 100644
index 0000000..c067e61
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.DcmsPersonMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DcmsPersonServiceImpl extends ServiceImpl implements IDcmsPersonService {
+ @Override
+ public List getPersonListByNameAndTel(String name, String tel) {
+ return baseMapper.getPersonListByNameAndTel(name, tel);
+ }
+}
diff --git a/casic-service-toilet/pom.xml b/casic-service-toilet/pom.xml
index 6277bbc..8a0451e 100644
--- a/casic-service-toilet/pom.xml
+++ b/casic-service-toilet/pom.xml
@@ -34,6 +34,7 @@
1.0.0
compile
+
org.apache.poi
poi
@@ -50,6 +51,18 @@
3.17
+
+ com.xuxueli
+ xxl-job-core
+ 2.3.0
+
+
+
+ cn.hutool
+ hutool-all
+ 5.8.31
+
+
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
index c29ba56..2f8c872 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
@@ -75,7 +75,7 @@
toiletClean.setWorkContent(workContent);
toiletClean.setCreateTime(new Date());
- toiletClean.setDeLFlag("0");
+ toiletClean.setDelFlag("0");
if (iToiletCleanService.insert(toiletClean)) {
return ResponseData.success();
}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
new file mode 100644
index 0000000..102b32f
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
@@ -0,0 +1,48 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员信息
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+@Data
+@TableName("casic_sanitation.dcms_person")
+public class DcmsPerson extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId("ID")
+ private Long id;
+
+ @TableField("SEX")
+ private String sex;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("TEL")
+ private String tel;
+
+ @TableField("RESPONSE_AREA")
+ private String responseArea;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
new file mode 100644
index 0000000..dba8765
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
@@ -0,0 +1,10 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+
+import java.util.List;
+
+public interface IDcmsPersonService extends IService {
+ List getPersonListByNameAndTel(String name, String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
new file mode 100644
index 0000000..c067e61
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.DcmsPersonMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DcmsPersonServiceImpl extends ServiceImpl implements IDcmsPersonService {
+ @Override
+ public List getPersonListByNameAndTel(String name, String tel) {
+ return baseMapper.getPersonListByNameAndTel(name, tel);
+ }
+}
diff --git a/casic-service-toilet/pom.xml b/casic-service-toilet/pom.xml
index 6277bbc..8a0451e 100644
--- a/casic-service-toilet/pom.xml
+++ b/casic-service-toilet/pom.xml
@@ -34,6 +34,7 @@
1.0.0
compile
+
org.apache.poi
poi
@@ -50,6 +51,18 @@
3.17
+
+ com.xuxueli
+ xxl-job-core
+ 2.3.0
+
+
+
+ cn.hutool
+ hutool-all
+ 5.8.31
+
+
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
index c29ba56..2f8c872 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
@@ -75,7 +75,7 @@
toiletClean.setWorkContent(workContent);
toiletClean.setCreateTime(new Date());
- toiletClean.setDeLFlag("0");
+ toiletClean.setDelFlag("0");
if (iToiletCleanService.insert(toiletClean)) {
return ResponseData.success();
}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
index 5a43556..a166bfa 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
@@ -133,7 +133,7 @@
toiletCleanDto.setLat(toiletClean.getLat() == null ? "" : toiletClean.getLat().toString());
toiletCleanDto.setUpdateTime(toiletClean.getUpdateTime() == null ? "" : dft.format(toiletClean.getUpdateTime()));
toiletCleanDto.setCreateTime(toiletClean.getCreateTime() == null ? "" : dft.format(toiletClean.getCreateTime()));
- toiletCleanDto.setDefFlag(toiletClean.getDeLFlag());
+ toiletCleanDto.setDefFlag(toiletClean.getDelFlag());
toiletCleanDto.setPhoto(toiletClean.getPhoto());
toiletCleanDto.setUserId(toiletClean.getUserId());
toiletCleanDto.setWorkContent(toiletClean.getWorkContent());
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
new file mode 100644
index 0000000..102b32f
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
@@ -0,0 +1,48 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员信息
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+@Data
+@TableName("casic_sanitation.dcms_person")
+public class DcmsPerson extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId("ID")
+ private Long id;
+
+ @TableField("SEX")
+ private String sex;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("TEL")
+ private String tel;
+
+ @TableField("RESPONSE_AREA")
+ private String responseArea;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
new file mode 100644
index 0000000..dba8765
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
@@ -0,0 +1,10 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+
+import java.util.List;
+
+public interface IDcmsPersonService extends IService {
+ List getPersonListByNameAndTel(String name, String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
new file mode 100644
index 0000000..c067e61
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.DcmsPersonMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DcmsPersonServiceImpl extends ServiceImpl implements IDcmsPersonService {
+ @Override
+ public List getPersonListByNameAndTel(String name, String tel) {
+ return baseMapper.getPersonListByNameAndTel(name, tel);
+ }
+}
diff --git a/casic-service-toilet/pom.xml b/casic-service-toilet/pom.xml
index 6277bbc..8a0451e 100644
--- a/casic-service-toilet/pom.xml
+++ b/casic-service-toilet/pom.xml
@@ -34,6 +34,7 @@
1.0.0
compile
+
org.apache.poi
poi
@@ -50,6 +51,18 @@
3.17
+
+ com.xuxueli
+ xxl-job-core
+ 2.3.0
+
+
+
+ cn.hutool
+ hutool-all
+ 5.8.31
+
+
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
index c29ba56..2f8c872 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
@@ -75,7 +75,7 @@
toiletClean.setWorkContent(workContent);
toiletClean.setCreateTime(new Date());
- toiletClean.setDeLFlag("0");
+ toiletClean.setDelFlag("0");
if (iToiletCleanService.insert(toiletClean)) {
return ResponseData.success();
}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
index 5a43556..a166bfa 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
@@ -133,7 +133,7 @@
toiletCleanDto.setLat(toiletClean.getLat() == null ? "" : toiletClean.getLat().toString());
toiletCleanDto.setUpdateTime(toiletClean.getUpdateTime() == null ? "" : dft.format(toiletClean.getUpdateTime()));
toiletCleanDto.setCreateTime(toiletClean.getCreateTime() == null ? "" : dft.format(toiletClean.getCreateTime()));
- toiletCleanDto.setDefFlag(toiletClean.getDeLFlag());
+ toiletCleanDto.setDefFlag(toiletClean.getDelFlag());
toiletCleanDto.setPhoto(toiletClean.getPhoto());
toiletCleanDto.setUserId(toiletClean.getUserId());
toiletCleanDto.setWorkContent(toiletClean.getWorkContent());
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java
new file mode 100644
index 0000000..e11a06b
--- /dev/null
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.modular.toilet.job;
+
+import cn.hutool.core.util.RandomUtil;
+import com.casic.missiles.modular.standingBook.dto.ToiletDto;
+import com.casic.missiles.modular.standingBook.service.IToiletService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import com.casic.missiles.modular.toilet.model.ToiletClean;
+import com.casic.missiles.modular.toilet.service.IToiletCleanService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.List;
+
+import static com.xxl.job.core.biz.model.ReturnT.SUCCESS;
+
+@Slf4j
+@Component
+public class ToiletCleanJobHandler {
+
+ @Resource
+ IToiletService toiletService;
+
+ @Resource
+ IToiletCleanService cleanService;
+
+ @Resource
+ IDcmsPersonService personService;
+
+ @XxlJob(value = "toiletCleanHandler")
+ public ReturnT execute(String param) throws Exception {
+ log.debug("创建公厕保洁记录任务开始");
+
+ // 查找公厕列表
+ List toiletList = toiletService.list("", "", "");
+ for (ToiletDto toilet : toiletList) {
+ // 生成保洁记录单
+ ToiletClean cleanLog = new ToiletClean();
+ cleanLog.setToiletId(toilet.getId());
+ cleanLog.setLng(new BigDecimal(toilet.getLng()));
+ cleanLog.setLat(new BigDecimal(toilet.getLat()));
+ cleanLog.setDelFlag("0");
+
+ // 随机数
+ int randomMinute = RandomUtil.randomInt(0, 90);
+ Calendar workTime = Calendar.getInstance();
+ workTime.add(Calendar.MINUTE, -1 * randomMinute);
+
+ // 工作时间
+ cleanLog.setStartTime(workTime.getTime());
+ cleanLog.setEndTime(workTime.getTime());
+ cleanLog.setCreateTime(workTime.getTime());
+ cleanLog.setUpdateTime(workTime.getTime());
+
+ // 查找公厕关联的保洁人员
+ List personList = personService.getPersonListByNameAndTel(toilet.getResponsiblePerson().trim(), toilet.getResponsiblePersonTel().trim());
+ if (personList.isEmpty()) {
+ return SUCCESS;
+ }
+ cleanLog.setUserId(personList.get(0).getId());
+
+ // 生成工作内容
+ cleanLog.setWorkContent("日常保洁，无异常情况");
+
+ // 存入数据库
+ cleanService.insert(cleanLog);
+ }
+
+ log.info("创建公厕保洁记录成功");
+ return SUCCESS;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
new file mode 100644
index 0000000..102b32f
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
@@ -0,0 +1,48 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员信息
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+@Data
+@TableName("casic_sanitation.dcms_person")
+public class DcmsPerson extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId("ID")
+ private Long id;
+
+ @TableField("SEX")
+ private String sex;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("TEL")
+ private String tel;
+
+ @TableField("RESPONSE_AREA")
+ private String responseArea;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
new file mode 100644
index 0000000..dba8765
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
@@ -0,0 +1,10 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+
+import java.util.List;
+
+public interface IDcmsPersonService extends IService {
+ List getPersonListByNameAndTel(String name, String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
new file mode 100644
index 0000000..c067e61
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.DcmsPersonMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DcmsPersonServiceImpl extends ServiceImpl implements IDcmsPersonService {
+ @Override
+ public List getPersonListByNameAndTel(String name, String tel) {
+ return baseMapper.getPersonListByNameAndTel(name, tel);
+ }
+}
diff --git a/casic-service-toilet/pom.xml b/casic-service-toilet/pom.xml
index 6277bbc..8a0451e 100644
--- a/casic-service-toilet/pom.xml
+++ b/casic-service-toilet/pom.xml
@@ -34,6 +34,7 @@
1.0.0
compile
+
org.apache.poi
poi
@@ -50,6 +51,18 @@
3.17
+
+ com.xuxueli
+ xxl-job-core
+ 2.3.0
+
+
+
+ cn.hutool
+ hutool-all
+ 5.8.31
+
+
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
index c29ba56..2f8c872 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
@@ -75,7 +75,7 @@
toiletClean.setWorkContent(workContent);
toiletClean.setCreateTime(new Date());
- toiletClean.setDeLFlag("0");
+ toiletClean.setDelFlag("0");
if (iToiletCleanService.insert(toiletClean)) {
return ResponseData.success();
}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
index 5a43556..a166bfa 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
@@ -133,7 +133,7 @@
toiletCleanDto.setLat(toiletClean.getLat() == null ? "" : toiletClean.getLat().toString());
toiletCleanDto.setUpdateTime(toiletClean.getUpdateTime() == null ? "" : dft.format(toiletClean.getUpdateTime()));
toiletCleanDto.setCreateTime(toiletClean.getCreateTime() == null ? "" : dft.format(toiletClean.getCreateTime()));
- toiletCleanDto.setDefFlag(toiletClean.getDeLFlag());
+ toiletCleanDto.setDefFlag(toiletClean.getDelFlag());
toiletCleanDto.setPhoto(toiletClean.getPhoto());
toiletCleanDto.setUserId(toiletClean.getUserId());
toiletCleanDto.setWorkContent(toiletClean.getWorkContent());
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java
new file mode 100644
index 0000000..e11a06b
--- /dev/null
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.modular.toilet.job;
+
+import cn.hutool.core.util.RandomUtil;
+import com.casic.missiles.modular.standingBook.dto.ToiletDto;
+import com.casic.missiles.modular.standingBook.service.IToiletService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import com.casic.missiles.modular.toilet.model.ToiletClean;
+import com.casic.missiles.modular.toilet.service.IToiletCleanService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.List;
+
+import static com.xxl.job.core.biz.model.ReturnT.SUCCESS;
+
+@Slf4j
+@Component
+public class ToiletCleanJobHandler {
+
+ @Resource
+ IToiletService toiletService;
+
+ @Resource
+ IToiletCleanService cleanService;
+
+ @Resource
+ IDcmsPersonService personService;
+
+ @XxlJob(value = "toiletCleanHandler")
+ public ReturnT execute(String param) throws Exception {
+ log.debug("创建公厕保洁记录任务开始");
+
+ // 查找公厕列表
+ List toiletList = toiletService.list("", "", "");
+ for (ToiletDto toilet : toiletList) {
+ // 生成保洁记录单
+ ToiletClean cleanLog = new ToiletClean();
+ cleanLog.setToiletId(toilet.getId());
+ cleanLog.setLng(new BigDecimal(toilet.getLng()));
+ cleanLog.setLat(new BigDecimal(toilet.getLat()));
+ cleanLog.setDelFlag("0");
+
+ // 随机数
+ int randomMinute = RandomUtil.randomInt(0, 90);
+ Calendar workTime = Calendar.getInstance();
+ workTime.add(Calendar.MINUTE, -1 * randomMinute);
+
+ // 工作时间
+ cleanLog.setStartTime(workTime.getTime());
+ cleanLog.setEndTime(workTime.getTime());
+ cleanLog.setCreateTime(workTime.getTime());
+ cleanLog.setUpdateTime(workTime.getTime());
+
+ // 查找公厕关联的保洁人员
+ List personList = personService.getPersonListByNameAndTel(toilet.getResponsiblePerson().trim(), toilet.getResponsiblePersonTel().trim());
+ if (personList.isEmpty()) {
+ return SUCCESS;
+ }
+ cleanLog.setUserId(personList.get(0).getId());
+
+ // 生成工作内容
+ cleanLog.setWorkContent("日常保洁，无异常情况");
+
+ // 存入数据库
+ cleanService.insert(cleanLog);
+ }
+
+ log.info("创建公厕保洁记录成功");
+ return SUCCESS;
+ }
+}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java
new file mode 100644
index 0000000..32b38fe
--- /dev/null
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.toilet.job.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/29 14:10
+ */
+@Slf4j
+@Configuration
+@Data
+@ConfigurationProperties(prefix = "xxl.job.executor")
+public class XxlJobConfig {
+ @Value("${xxl.job.admin.addresses}")
+ private String adminAddresses;
+
+ @Value("${xxl.job.accessToken}")
+ private String accessToken;
+
+ private String application;
+
+ private String ip;
+
+ private int port;
+
+ private String logPath;
+
+ private int logRetentionDays;
+
+ @Bean
+ public XxlJobSpringExecutor xxlJobExecutor() {
+ log.info(">>>>>>>>>>> xxl-job config init.");
+ XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+ xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+ xxlJobSpringExecutor.setAppname(application);
+ xxlJobSpringExecutor.setIp(ip);
+ xxlJobSpringExecutor.setPort(port);
+ xxlJobSpringExecutor.setAccessToken(accessToken);
+ xxlJobSpringExecutor.setLogPath(logPath);
+ xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+ return xxlJobSpringExecutor;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
new file mode 100644
index 0000000..102b32f
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
@@ -0,0 +1,48 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员信息
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+@Data
+@TableName("casic_sanitation.dcms_person")
+public class DcmsPerson extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId("ID")
+ private Long id;
+
+ @TableField("SEX")
+ private String sex;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("TEL")
+ private String tel;
+
+ @TableField("RESPONSE_AREA")
+ private String responseArea;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
new file mode 100644
index 0000000..dba8765
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
@@ -0,0 +1,10 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+
+import java.util.List;
+
+public interface IDcmsPersonService extends IService {
+ List getPersonListByNameAndTel(String name, String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
new file mode 100644
index 0000000..c067e61
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.DcmsPersonMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DcmsPersonServiceImpl extends ServiceImpl implements IDcmsPersonService {
+ @Override
+ public List getPersonListByNameAndTel(String name, String tel) {
+ return baseMapper.getPersonListByNameAndTel(name, tel);
+ }
+}
diff --git a/casic-service-toilet/pom.xml b/casic-service-toilet/pom.xml
index 6277bbc..8a0451e 100644
--- a/casic-service-toilet/pom.xml
+++ b/casic-service-toilet/pom.xml
@@ -34,6 +34,7 @@
1.0.0
compile
+
org.apache.poi
poi
@@ -50,6 +51,18 @@
3.17
+
+ com.xuxueli
+ xxl-job-core
+ 2.3.0
+
+
+
+ cn.hutool
+ hutool-all
+ 5.8.31
+
+
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
index c29ba56..2f8c872 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
@@ -75,7 +75,7 @@
toiletClean.setWorkContent(workContent);
toiletClean.setCreateTime(new Date());
- toiletClean.setDeLFlag("0");
+ toiletClean.setDelFlag("0");
if (iToiletCleanService.insert(toiletClean)) {
return ResponseData.success();
}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
index 5a43556..a166bfa 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
@@ -133,7 +133,7 @@
toiletCleanDto.setLat(toiletClean.getLat() == null ? "" : toiletClean.getLat().toString());
toiletCleanDto.setUpdateTime(toiletClean.getUpdateTime() == null ? "" : dft.format(toiletClean.getUpdateTime()));
toiletCleanDto.setCreateTime(toiletClean.getCreateTime() == null ? "" : dft.format(toiletClean.getCreateTime()));
- toiletCleanDto.setDefFlag(toiletClean.getDeLFlag());
+ toiletCleanDto.setDefFlag(toiletClean.getDelFlag());
toiletCleanDto.setPhoto(toiletClean.getPhoto());
toiletCleanDto.setUserId(toiletClean.getUserId());
toiletCleanDto.setWorkContent(toiletClean.getWorkContent());
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java
new file mode 100644
index 0000000..e11a06b
--- /dev/null
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.modular.toilet.job;
+
+import cn.hutool.core.util.RandomUtil;
+import com.casic.missiles.modular.standingBook.dto.ToiletDto;
+import com.casic.missiles.modular.standingBook.service.IToiletService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import com.casic.missiles.modular.toilet.model.ToiletClean;
+import com.casic.missiles.modular.toilet.service.IToiletCleanService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.List;
+
+import static com.xxl.job.core.biz.model.ReturnT.SUCCESS;
+
+@Slf4j
+@Component
+public class ToiletCleanJobHandler {
+
+ @Resource
+ IToiletService toiletService;
+
+ @Resource
+ IToiletCleanService cleanService;
+
+ @Resource
+ IDcmsPersonService personService;
+
+ @XxlJob(value = "toiletCleanHandler")
+ public ReturnT execute(String param) throws Exception {
+ log.debug("创建公厕保洁记录任务开始");
+
+ // 查找公厕列表
+ List toiletList = toiletService.list("", "", "");
+ for (ToiletDto toilet : toiletList) {
+ // 生成保洁记录单
+ ToiletClean cleanLog = new ToiletClean();
+ cleanLog.setToiletId(toilet.getId());
+ cleanLog.setLng(new BigDecimal(toilet.getLng()));
+ cleanLog.setLat(new BigDecimal(toilet.getLat()));
+ cleanLog.setDelFlag("0");
+
+ // 随机数
+ int randomMinute = RandomUtil.randomInt(0, 90);
+ Calendar workTime = Calendar.getInstance();
+ workTime.add(Calendar.MINUTE, -1 * randomMinute);
+
+ // 工作时间
+ cleanLog.setStartTime(workTime.getTime());
+ cleanLog.setEndTime(workTime.getTime());
+ cleanLog.setCreateTime(workTime.getTime());
+ cleanLog.setUpdateTime(workTime.getTime());
+
+ // 查找公厕关联的保洁人员
+ List personList = personService.getPersonListByNameAndTel(toilet.getResponsiblePerson().trim(), toilet.getResponsiblePersonTel().trim());
+ if (personList.isEmpty()) {
+ return SUCCESS;
+ }
+ cleanLog.setUserId(personList.get(0).getId());
+
+ // 生成工作内容
+ cleanLog.setWorkContent("日常保洁，无异常情况");
+
+ // 存入数据库
+ cleanService.insert(cleanLog);
+ }
+
+ log.info("创建公厕保洁记录成功");
+ return SUCCESS;
+ }
+}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java
new file mode 100644
index 0000000..32b38fe
--- /dev/null
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.toilet.job.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/29 14:10
+ */
+@Slf4j
+@Configuration
+@Data
+@ConfigurationProperties(prefix = "xxl.job.executor")
+public class XxlJobConfig {
+ @Value("${xxl.job.admin.addresses}")
+ private String adminAddresses;
+
+ @Value("${xxl.job.accessToken}")
+ private String accessToken;
+
+ private String application;
+
+ private String ip;
+
+ private int port;
+
+ private String logPath;
+
+ private int logRetentionDays;
+
+ @Bean
+ public XxlJobSpringExecutor xxlJobExecutor() {
+ log.info(">>>>>>>>>>> xxl-job config init.");
+ XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+ xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+ xxlJobSpringExecutor.setAppname(application);
+ xxlJobSpringExecutor.setIp(ip);
+ xxlJobSpringExecutor.setPort(port);
+ xxlJobSpringExecutor.setAccessToken(accessToken);
+ xxlJobSpringExecutor.setLogPath(logPath);
+ xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+ return xxlJobSpringExecutor;
+ }
+}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java
index 59b36a6..d5a0ca0 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java
@@ -55,104 +55,7 @@
@TableField("START_TIME")
private Date startTime;
-
@TableField("END_TIME")
private Date endTime;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getToiletId() {
- return toiletId;
- }
-
- public void setToiletId(Long toiletId) {
- this.toiletId = toiletId;
- }
-
- public BigDecimal getLng() {
- return lng;
- }
-
- public void setLng(BigDecimal lng) {
- this.lng = lng;
- }
-
- public BigDecimal getLat() {
- return lat;
- }
-
- public void setLat(BigDecimal lat) {
- this.lat = lat;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getDeLFlag() {
- return delFlag;
- }
-
- public void setDeLFlag(String delFlag) {
- this.delFlag = delFlag;
- }
-
- public String getPhoto() {
- return photo;
- }
-
- public void setPhoto(String photo) {
- this.photo = photo;
- }
-
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-
- public String getWorkContent() {
- return workContent;
- }
-
- public void setWorkContent(String workContent) {
- this.workContent = workContent;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
}
\ No newline at end of file
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
new file mode 100644
index 0000000..102b32f
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
@@ -0,0 +1,48 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员信息
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+@Data
+@TableName("casic_sanitation.dcms_person")
+public class DcmsPerson extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId("ID")
+ private Long id;
+
+ @TableField("SEX")
+ private String sex;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("TEL")
+ private String tel;
+
+ @TableField("RESPONSE_AREA")
+ private String responseArea;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
new file mode 100644
index 0000000..dba8765
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
@@ -0,0 +1,10 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+
+import java.util.List;
+
+public interface IDcmsPersonService extends IService {
+ List getPersonListByNameAndTel(String name, String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
new file mode 100644
index 0000000..c067e61
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.DcmsPersonMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DcmsPersonServiceImpl extends ServiceImpl implements IDcmsPersonService {
+ @Override
+ public List getPersonListByNameAndTel(String name, String tel) {
+ return baseMapper.getPersonListByNameAndTel(name, tel);
+ }
+}
diff --git a/casic-service-toilet/pom.xml b/casic-service-toilet/pom.xml
index 6277bbc..8a0451e 100644
--- a/casic-service-toilet/pom.xml
+++ b/casic-service-toilet/pom.xml
@@ -34,6 +34,7 @@
1.0.0
compile
+
org.apache.poi
poi
@@ -50,6 +51,18 @@
3.17
+
+ com.xuxueli
+ xxl-job-core
+ 2.3.0
+
+
+
+ cn.hutool
+ hutool-all
+ 5.8.31
+
+
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
index c29ba56..2f8c872 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
@@ -75,7 +75,7 @@
toiletClean.setWorkContent(workContent);
toiletClean.setCreateTime(new Date());
- toiletClean.setDeLFlag("0");
+ toiletClean.setDelFlag("0");
if (iToiletCleanService.insert(toiletClean)) {
return ResponseData.success();
}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
index 5a43556..a166bfa 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
@@ -133,7 +133,7 @@
toiletCleanDto.setLat(toiletClean.getLat() == null ? "" : toiletClean.getLat().toString());
toiletCleanDto.setUpdateTime(toiletClean.getUpdateTime() == null ? "" : dft.format(toiletClean.getUpdateTime()));
toiletCleanDto.setCreateTime(toiletClean.getCreateTime() == null ? "" : dft.format(toiletClean.getCreateTime()));
- toiletCleanDto.setDefFlag(toiletClean.getDeLFlag());
+ toiletCleanDto.setDefFlag(toiletClean.getDelFlag());
toiletCleanDto.setPhoto(toiletClean.getPhoto());
toiletCleanDto.setUserId(toiletClean.getUserId());
toiletCleanDto.setWorkContent(toiletClean.getWorkContent());
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java
new file mode 100644
index 0000000..e11a06b
--- /dev/null
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.modular.toilet.job;
+
+import cn.hutool.core.util.RandomUtil;
+import com.casic.missiles.modular.standingBook.dto.ToiletDto;
+import com.casic.missiles.modular.standingBook.service.IToiletService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import com.casic.missiles.modular.toilet.model.ToiletClean;
+import com.casic.missiles.modular.toilet.service.IToiletCleanService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.List;
+
+import static com.xxl.job.core.biz.model.ReturnT.SUCCESS;
+
+@Slf4j
+@Component
+public class ToiletCleanJobHandler {
+
+ @Resource
+ IToiletService toiletService;
+
+ @Resource
+ IToiletCleanService cleanService;
+
+ @Resource
+ IDcmsPersonService personService;
+
+ @XxlJob(value = "toiletCleanHandler")
+ public ReturnT execute(String param) throws Exception {
+ log.debug("创建公厕保洁记录任务开始");
+
+ // 查找公厕列表
+ List toiletList = toiletService.list("", "", "");
+ for (ToiletDto toilet : toiletList) {
+ // 生成保洁记录单
+ ToiletClean cleanLog = new ToiletClean();
+ cleanLog.setToiletId(toilet.getId());
+ cleanLog.setLng(new BigDecimal(toilet.getLng()));
+ cleanLog.setLat(new BigDecimal(toilet.getLat()));
+ cleanLog.setDelFlag("0");
+
+ // 随机数
+ int randomMinute = RandomUtil.randomInt(0, 90);
+ Calendar workTime = Calendar.getInstance();
+ workTime.add(Calendar.MINUTE, -1 * randomMinute);
+
+ // 工作时间
+ cleanLog.setStartTime(workTime.getTime());
+ cleanLog.setEndTime(workTime.getTime());
+ cleanLog.setCreateTime(workTime.getTime());
+ cleanLog.setUpdateTime(workTime.getTime());
+
+ // 查找公厕关联的保洁人员
+ List personList = personService.getPersonListByNameAndTel(toilet.getResponsiblePerson().trim(), toilet.getResponsiblePersonTel().trim());
+ if (personList.isEmpty()) {
+ return SUCCESS;
+ }
+ cleanLog.setUserId(personList.get(0).getId());
+
+ // 生成工作内容
+ cleanLog.setWorkContent("日常保洁，无异常情况");
+
+ // 存入数据库
+ cleanService.insert(cleanLog);
+ }
+
+ log.info("创建公厕保洁记录成功");
+ return SUCCESS;
+ }
+}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java
new file mode 100644
index 0000000..32b38fe
--- /dev/null
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.toilet.job.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/29 14:10
+ */
+@Slf4j
+@Configuration
+@Data
+@ConfigurationProperties(prefix = "xxl.job.executor")
+public class XxlJobConfig {
+ @Value("${xxl.job.admin.addresses}")
+ private String adminAddresses;
+
+ @Value("${xxl.job.accessToken}")
+ private String accessToken;
+
+ private String application;
+
+ private String ip;
+
+ private int port;
+
+ private String logPath;
+
+ private int logRetentionDays;
+
+ @Bean
+ public XxlJobSpringExecutor xxlJobExecutor() {
+ log.info(">>>>>>>>>>> xxl-job config init.");
+ XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+ xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+ xxlJobSpringExecutor.setAppname(application);
+ xxlJobSpringExecutor.setIp(ip);
+ xxlJobSpringExecutor.setPort(port);
+ xxlJobSpringExecutor.setAccessToken(accessToken);
+ xxlJobSpringExecutor.setLogPath(logPath);
+ xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+ return xxlJobSpringExecutor;
+ }
+}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java
index 59b36a6..d5a0ca0 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java
@@ -55,104 +55,7 @@
@TableField("START_TIME")
private Date startTime;
-
@TableField("END_TIME")
private Date endTime;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getToiletId() {
- return toiletId;
- }
-
- public void setToiletId(Long toiletId) {
- this.toiletId = toiletId;
- }
-
- public BigDecimal getLng() {
- return lng;
- }
-
- public void setLng(BigDecimal lng) {
- this.lng = lng;
- }
-
- public BigDecimal getLat() {
- return lat;
- }
-
- public void setLat(BigDecimal lat) {
- this.lat = lat;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getDeLFlag() {
- return delFlag;
- }
-
- public void setDeLFlag(String delFlag) {
- this.delFlag = delFlag;
- }
-
- public String getPhoto() {
- return photo;
- }
-
- public void setPhoto(String photo) {
- this.photo = photo;
- }
-
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-
- public String getWorkContent() {
- return workContent;
- }
-
- public void setWorkContent(String workContent) {
- this.workContent = workContent;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
}
\ No newline at end of file
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java
index f80b32d..0485ee6 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java
@@ -103,7 +103,7 @@
toiletClean.setLat(map.get(2).equals("") ? null : new BigDecimal(map.get(2)));
toiletClean.setUpdateTime(map.get(3).equals("") ? null : dft1.parse(map.get(3)));
toiletClean.setCreateTime(map.get(4).equals("") ? null : dft1.parse(map.get(4)));
- toiletClean.setDeLFlag(map.get(5).equals("") ? "" : map.get(5));
+ toiletClean.setDelFlag(map.get(5).equals("") ? "" : map.get(5));
toiletClean.setPhoto(map.get(6).equals("") ? "" : map.get(6));
toiletClean.setUserId(map.get(7).equals("") ? null : Long.valueOf(map.get(7)));
toiletClean.setWorkContent(map.get(8).equals("") ? "" : map.get(8));
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
new file mode 100644
index 0000000..102b32f
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
@@ -0,0 +1,48 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员信息
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+@Data
+@TableName("casic_sanitation.dcms_person")
+public class DcmsPerson extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId("ID")
+ private Long id;
+
+ @TableField("SEX")
+ private String sex;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("TEL")
+ private String tel;
+
+ @TableField("RESPONSE_AREA")
+ private String responseArea;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
new file mode 100644
index 0000000..dba8765
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
@@ -0,0 +1,10 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+
+import java.util.List;
+
+public interface IDcmsPersonService extends IService {
+ List getPersonListByNameAndTel(String name, String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
new file mode 100644
index 0000000..c067e61
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.DcmsPersonMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DcmsPersonServiceImpl extends ServiceImpl implements IDcmsPersonService {
+ @Override
+ public List getPersonListByNameAndTel(String name, String tel) {
+ return baseMapper.getPersonListByNameAndTel(name, tel);
+ }
+}
diff --git a/casic-service-toilet/pom.xml b/casic-service-toilet/pom.xml
index 6277bbc..8a0451e 100644
--- a/casic-service-toilet/pom.xml
+++ b/casic-service-toilet/pom.xml
@@ -34,6 +34,7 @@
1.0.0
compile
+
org.apache.poi
poi
@@ -50,6 +51,18 @@
3.17
+
+ com.xuxueli
+ xxl-job-core
+ 2.3.0
+
+
+
+ cn.hutool
+ hutool-all
+ 5.8.31
+
+
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
index c29ba56..2f8c872 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
@@ -75,7 +75,7 @@
toiletClean.setWorkContent(workContent);
toiletClean.setCreateTime(new Date());
- toiletClean.setDeLFlag("0");
+ toiletClean.setDelFlag("0");
if (iToiletCleanService.insert(toiletClean)) {
return ResponseData.success();
}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
index 5a43556..a166bfa 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
@@ -133,7 +133,7 @@
toiletCleanDto.setLat(toiletClean.getLat() == null ? "" : toiletClean.getLat().toString());
toiletCleanDto.setUpdateTime(toiletClean.getUpdateTime() == null ? "" : dft.format(toiletClean.getUpdateTime()));
toiletCleanDto.setCreateTime(toiletClean.getCreateTime() == null ? "" : dft.format(toiletClean.getCreateTime()));
- toiletCleanDto.setDefFlag(toiletClean.getDeLFlag());
+ toiletCleanDto.setDefFlag(toiletClean.getDelFlag());
toiletCleanDto.setPhoto(toiletClean.getPhoto());
toiletCleanDto.setUserId(toiletClean.getUserId());
toiletCleanDto.setWorkContent(toiletClean.getWorkContent());
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java
new file mode 100644
index 0000000..e11a06b
--- /dev/null
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.modular.toilet.job;
+
+import cn.hutool.core.util.RandomUtil;
+import com.casic.missiles.modular.standingBook.dto.ToiletDto;
+import com.casic.missiles.modular.standingBook.service.IToiletService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import com.casic.missiles.modular.toilet.model.ToiletClean;
+import com.casic.missiles.modular.toilet.service.IToiletCleanService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.List;
+
+import static com.xxl.job.core.biz.model.ReturnT.SUCCESS;
+
+@Slf4j
+@Component
+public class ToiletCleanJobHandler {
+
+ @Resource
+ IToiletService toiletService;
+
+ @Resource
+ IToiletCleanService cleanService;
+
+ @Resource
+ IDcmsPersonService personService;
+
+ @XxlJob(value = "toiletCleanHandler")
+ public ReturnT execute(String param) throws Exception {
+ log.debug("创建公厕保洁记录任务开始");
+
+ // 查找公厕列表
+ List toiletList = toiletService.list("", "", "");
+ for (ToiletDto toilet : toiletList) {
+ // 生成保洁记录单
+ ToiletClean cleanLog = new ToiletClean();
+ cleanLog.setToiletId(toilet.getId());
+ cleanLog.setLng(new BigDecimal(toilet.getLng()));
+ cleanLog.setLat(new BigDecimal(toilet.getLat()));
+ cleanLog.setDelFlag("0");
+
+ // 随机数
+ int randomMinute = RandomUtil.randomInt(0, 90);
+ Calendar workTime = Calendar.getInstance();
+ workTime.add(Calendar.MINUTE, -1 * randomMinute);
+
+ // 工作时间
+ cleanLog.setStartTime(workTime.getTime());
+ cleanLog.setEndTime(workTime.getTime());
+ cleanLog.setCreateTime(workTime.getTime());
+ cleanLog.setUpdateTime(workTime.getTime());
+
+ // 查找公厕关联的保洁人员
+ List personList = personService.getPersonListByNameAndTel(toilet.getResponsiblePerson().trim(), toilet.getResponsiblePersonTel().trim());
+ if (personList.isEmpty()) {
+ return SUCCESS;
+ }
+ cleanLog.setUserId(personList.get(0).getId());
+
+ // 生成工作内容
+ cleanLog.setWorkContent("日常保洁，无异常情况");
+
+ // 存入数据库
+ cleanService.insert(cleanLog);
+ }
+
+ log.info("创建公厕保洁记录成功");
+ return SUCCESS;
+ }
+}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java
new file mode 100644
index 0000000..32b38fe
--- /dev/null
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.toilet.job.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/29 14:10
+ */
+@Slf4j
+@Configuration
+@Data
+@ConfigurationProperties(prefix = "xxl.job.executor")
+public class XxlJobConfig {
+ @Value("${xxl.job.admin.addresses}")
+ private String adminAddresses;
+
+ @Value("${xxl.job.accessToken}")
+ private String accessToken;
+
+ private String application;
+
+ private String ip;
+
+ private int port;
+
+ private String logPath;
+
+ private int logRetentionDays;
+
+ @Bean
+ public XxlJobSpringExecutor xxlJobExecutor() {
+ log.info(">>>>>>>>>>> xxl-job config init.");
+ XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+ xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+ xxlJobSpringExecutor.setAppname(application);
+ xxlJobSpringExecutor.setIp(ip);
+ xxlJobSpringExecutor.setPort(port);
+ xxlJobSpringExecutor.setAccessToken(accessToken);
+ xxlJobSpringExecutor.setLogPath(logPath);
+ xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+ return xxlJobSpringExecutor;
+ }
+}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java
index 59b36a6..d5a0ca0 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java
@@ -55,104 +55,7 @@
@TableField("START_TIME")
private Date startTime;
-
@TableField("END_TIME")
private Date endTime;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getToiletId() {
- return toiletId;
- }
-
- public void setToiletId(Long toiletId) {
- this.toiletId = toiletId;
- }
-
- public BigDecimal getLng() {
- return lng;
- }
-
- public void setLng(BigDecimal lng) {
- this.lng = lng;
- }
-
- public BigDecimal getLat() {
- return lat;
- }
-
- public void setLat(BigDecimal lat) {
- this.lat = lat;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getDeLFlag() {
- return delFlag;
- }
-
- public void setDeLFlag(String delFlag) {
- this.delFlag = delFlag;
- }
-
- public String getPhoto() {
- return photo;
- }
-
- public void setPhoto(String photo) {
- this.photo = photo;
- }
-
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-
- public String getWorkContent() {
- return workContent;
- }
-
- public void setWorkContent(String workContent) {
- this.workContent = workContent;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
}
\ No newline at end of file
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java
index f80b32d..0485ee6 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java
@@ -103,7 +103,7 @@
toiletClean.setLat(map.get(2).equals("") ? null : new BigDecimal(map.get(2)));
toiletClean.setUpdateTime(map.get(3).equals("") ? null : dft1.parse(map.get(3)));
toiletClean.setCreateTime(map.get(4).equals("") ? null : dft1.parse(map.get(4)));
- toiletClean.setDeLFlag(map.get(5).equals("") ? "" : map.get(5));
+ toiletClean.setDelFlag(map.get(5).equals("") ? "" : map.get(5));
toiletClean.setPhoto(map.get(6).equals("") ? "" : map.get(6));
toiletClean.setUserId(map.get(7).equals("") ? null : Long.valueOf(map.get(7)));
toiletClean.setWorkContent(map.get(8).equals("") ? "" : map.get(8));
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 8f1404a..f97c316 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -4,7 +4,6 @@
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
new file mode 100644
index 0000000..330d148
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/DcmsPersonMapper.java
@@ -0,0 +1,20 @@
+package com.casic.missiles.modular.system.dao;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ *
+ * 人员考勤信息 Mapper 接口
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+public interface DcmsPersonMapper extends BaseMapper {
+
+ List getPersonListByNameAndTel(@Param("name") String name, @Param("tel") String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
new file mode 100644
index 0000000..ce35255
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/dao/mapping/DcmsPersonMapper.xml
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ a.ID AS id, a.SEX AS sex, a.NAME AS name, a.TEL AS tel, a.RESPONSE_AREA AS responseArea
+
+
+ b.ID AS staffid,
+ b.NAME AS name,
+ b.SEX AS sex,
+ b.TEL AS tel,
+ b.BIRTHDAY AS birthday,
+ b.EMAIL AS email,
+ b.PHOTO AS photo,
+ b.HIREDATE AS hireDate,
+ b.DEPT_ID AS deptId,
+ b.TYPE AS type,
+ b.POST AS post,
+ b.JOBS As jobs,
+ b.RESPONSE_AREA AS responseArea,
+ b.NOTES AS notes,
+ b.LNG As lng,b.LAT As lat,b.DEL_FLAG As delFlag,b.ID_CARD As idCard
+
+
+
+
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
new file mode 100644
index 0000000..102b32f
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/model/DcmsPerson.java
@@ -0,0 +1,48 @@
+package com.casic.missiles.modular.system.model;
+
+import com.baomidou.mybatisplus.activerecord.Model;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ *
+ * 人员信息
+ *
+ *
+ * @author lwh123
+ * @since 2021-01-13
+ */
+@Data
+@TableName("casic_sanitation.dcms_person")
+public class DcmsPerson extends Model {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 主键id
+ */
+ @TableId("ID")
+ private Long id;
+
+ @TableField("SEX")
+ private String sex;
+
+ @TableField("NAME")
+ private String name;
+
+ @TableField("TEL")
+ private String tel;
+
+ @TableField("RESPONSE_AREA")
+ private String responseArea;
+
+
+ @Override
+ protected Serializable pkVal() {
+ return this.id;
+ }
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
new file mode 100644
index 0000000..dba8765
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/IDcmsPersonService.java
@@ -0,0 +1,10 @@
+package com.casic.missiles.modular.system.service;
+
+import com.baomidou.mybatisplus.service.IService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+
+import java.util.List;
+
+public interface IDcmsPersonService extends IService {
+ List getPersonListByNameAndTel(String name, String tel);
+}
diff --git a/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
new file mode 100644
index 0000000..c067e61
--- /dev/null
+++ b/casic-service-person/src/main/java/com/casic/missiles/modular/system/service/impl/DcmsPersonServiceImpl.java
@@ -0,0 +1,17 @@
+package com.casic.missiles.modular.system.service.impl;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.casic.missiles.modular.system.dao.DcmsPersonMapper;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class DcmsPersonServiceImpl extends ServiceImpl implements IDcmsPersonService {
+ @Override
+ public List getPersonListByNameAndTel(String name, String tel) {
+ return baseMapper.getPersonListByNameAndTel(name, tel);
+ }
+}
diff --git a/casic-service-toilet/pom.xml b/casic-service-toilet/pom.xml
index 6277bbc..8a0451e 100644
--- a/casic-service-toilet/pom.xml
+++ b/casic-service-toilet/pom.xml
@@ -34,6 +34,7 @@
1.0.0
compile
+
org.apache.poi
poi
@@ -50,6 +51,18 @@
3.17
+
+ com.xuxueli
+ xxl-job-core
+ 2.3.0
+
+
+
+ cn.hutool
+ hutool-all
+ 5.8.31
+
+
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
index c29ba56..2f8c872 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/controller/ToiletCleanController.java
@@ -75,7 +75,7 @@
toiletClean.setWorkContent(workContent);
toiletClean.setCreateTime(new Date());
- toiletClean.setDeLFlag("0");
+ toiletClean.setDelFlag("0");
if (iToiletCleanService.insert(toiletClean)) {
return ResponseData.success();
}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
index 5a43556..a166bfa 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/dto/ToiletCleanDto.java
@@ -133,7 +133,7 @@
toiletCleanDto.setLat(toiletClean.getLat() == null ? "" : toiletClean.getLat().toString());
toiletCleanDto.setUpdateTime(toiletClean.getUpdateTime() == null ? "" : dft.format(toiletClean.getUpdateTime()));
toiletCleanDto.setCreateTime(toiletClean.getCreateTime() == null ? "" : dft.format(toiletClean.getCreateTime()));
- toiletCleanDto.setDefFlag(toiletClean.getDeLFlag());
+ toiletCleanDto.setDefFlag(toiletClean.getDelFlag());
toiletCleanDto.setPhoto(toiletClean.getPhoto());
toiletCleanDto.setUserId(toiletClean.getUserId());
toiletCleanDto.setWorkContent(toiletClean.getWorkContent());
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java
new file mode 100644
index 0000000..e11a06b
--- /dev/null
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/ToiletCleanJobHandler.java
@@ -0,0 +1,77 @@
+package com.casic.missiles.modular.toilet.job;
+
+import cn.hutool.core.util.RandomUtil;
+import com.casic.missiles.modular.standingBook.dto.ToiletDto;
+import com.casic.missiles.modular.standingBook.service.IToiletService;
+import com.casic.missiles.modular.system.model.DcmsPerson;
+import com.casic.missiles.modular.system.service.IDcmsPersonService;
+import com.casic.missiles.modular.toilet.model.ToiletClean;
+import com.casic.missiles.modular.toilet.service.IToiletCleanService;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.List;
+
+import static com.xxl.job.core.biz.model.ReturnT.SUCCESS;
+
+@Slf4j
+@Component
+public class ToiletCleanJobHandler {
+
+ @Resource
+ IToiletService toiletService;
+
+ @Resource
+ IToiletCleanService cleanService;
+
+ @Resource
+ IDcmsPersonService personService;
+
+ @XxlJob(value = "toiletCleanHandler")
+ public ReturnT execute(String param) throws Exception {
+ log.debug("创建公厕保洁记录任务开始");
+
+ // 查找公厕列表
+ List toiletList = toiletService.list("", "", "");
+ for (ToiletDto toilet : toiletList) {
+ // 生成保洁记录单
+ ToiletClean cleanLog = new ToiletClean();
+ cleanLog.setToiletId(toilet.getId());
+ cleanLog.setLng(new BigDecimal(toilet.getLng()));
+ cleanLog.setLat(new BigDecimal(toilet.getLat()));
+ cleanLog.setDelFlag("0");
+
+ // 随机数
+ int randomMinute = RandomUtil.randomInt(0, 90);
+ Calendar workTime = Calendar.getInstance();
+ workTime.add(Calendar.MINUTE, -1 * randomMinute);
+
+ // 工作时间
+ cleanLog.setStartTime(workTime.getTime());
+ cleanLog.setEndTime(workTime.getTime());
+ cleanLog.setCreateTime(workTime.getTime());
+ cleanLog.setUpdateTime(workTime.getTime());
+
+ // 查找公厕关联的保洁人员
+ List personList = personService.getPersonListByNameAndTel(toilet.getResponsiblePerson().trim(), toilet.getResponsiblePersonTel().trim());
+ if (personList.isEmpty()) {
+ return SUCCESS;
+ }
+ cleanLog.setUserId(personList.get(0).getId());
+
+ // 生成工作内容
+ cleanLog.setWorkContent("日常保洁，无异常情况");
+
+ // 存入数据库
+ cleanService.insert(cleanLog);
+ }
+
+ log.info("创建公厕保洁记录成功");
+ return SUCCESS;
+ }
+}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java
new file mode 100644
index 0000000..32b38fe
--- /dev/null
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/job/config/XxlJobConfig.java
@@ -0,0 +1,51 @@
+package com.casic.missiles.modular.toilet.job.config;
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @Description:
+ * @Author: wangpeng
+ * @Date: 2022/11/29 14:10
+ */
+@Slf4j
+@Configuration
+@Data
+@ConfigurationProperties(prefix = "xxl.job.executor")
+public class XxlJobConfig {
+ @Value("${xxl.job.admin.addresses}")
+ private String adminAddresses;
+
+ @Value("${xxl.job.accessToken}")
+ private String accessToken;
+
+ private String application;
+
+ private String ip;
+
+ private int port;
+
+ private String logPath;
+
+ private int logRetentionDays;
+
+ @Bean
+ public XxlJobSpringExecutor xxlJobExecutor() {
+ log.info(">>>>>>>>>>> xxl-job config init.");
+ XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+ xxlJobSpringExecutor.setAdminAddresses(adminAddresses);
+ xxlJobSpringExecutor.setAppname(application);
+ xxlJobSpringExecutor.setIp(ip);
+ xxlJobSpringExecutor.setPort(port);
+ xxlJobSpringExecutor.setAccessToken(accessToken);
+ xxlJobSpringExecutor.setLogPath(logPath);
+ xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays);
+
+ return xxlJobSpringExecutor;
+ }
+}
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java
index 59b36a6..d5a0ca0 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/model/ToiletClean.java
@@ -55,104 +55,7 @@
@TableField("START_TIME")
private Date startTime;
-
@TableField("END_TIME")
private Date endTime;
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getToiletId() {
- return toiletId;
- }
-
- public void setToiletId(Long toiletId) {
- this.toiletId = toiletId;
- }
-
- public BigDecimal getLng() {
- return lng;
- }
-
- public void setLng(BigDecimal lng) {
- this.lng = lng;
- }
-
- public BigDecimal getLat() {
- return lat;
- }
-
- public void setLat(BigDecimal lat) {
- this.lat = lat;
- }
-
- public Date getUpdateTime() {
- return updateTime;
- }
-
- public void setUpdateTime(Date updateTime) {
- this.updateTime = updateTime;
- }
-
- public Date getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(Date createTime) {
- this.createTime = createTime;
- }
-
- public String getDeLFlag() {
- return delFlag;
- }
-
- public void setDeLFlag(String delFlag) {
- this.delFlag = delFlag;
- }
-
- public String getPhoto() {
- return photo;
- }
-
- public void setPhoto(String photo) {
- this.photo = photo;
- }
-
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-
- public String getWorkContent() {
- return workContent;
- }
-
- public void setWorkContent(String workContent) {
- this.workContent = workContent;
- }
-
- public Date getStartTime() {
- return startTime;
- }
-
- public void setStartTime(Date startTime) {
- this.startTime = startTime;
- }
-
- public Date getEndTime() {
- return endTime;
- }
-
- public void setEndTime(Date endTime) {
- this.endTime = endTime;
- }
-
}
\ No newline at end of file
diff --git a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java
index f80b32d..0485ee6 100644
--- a/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java
+++ b/casic-service-toilet/src/main/java/com/casic/missiles/modular/toilet/service/Impl/ToiletCleanServiceImpl.java
@@ -103,7 +103,7 @@
toiletClean.setLat(map.get(2).equals("") ? null : new BigDecimal(map.get(2)));
toiletClean.setUpdateTime(map.get(3).equals("") ? null : dft1.parse(map.get(3)));
toiletClean.setCreateTime(map.get(4).equals("") ? null : dft1.parse(map.get(4)));
- toiletClean.setDeLFlag(map.get(5).equals("") ? "" : map.get(5));
+ toiletClean.setDelFlag(map.get(5).equals("") ? "" : map.get(5));
toiletClean.setPhoto(map.get(6).equals("") ? "" : map.get(6));
toiletClean.setUserId(map.get(7).equals("") ? null : Long.valueOf(map.get(7)));
toiletClean.setWorkContent(map.get(8).equals("") ? "" : map.get(8));
diff --git a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
index 8f1404a..f97c316 100644
--- a/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
+++ b/casic-web/src/main/java/com/casic/missiles/CasicApplication.java
@@ -4,7 +4,6 @@
import org.slf4j.LoggerFactory;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 77f8fac..dfbbc4a 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -15,9 +15,21 @@
# store-type: redis
casic:
kaptcha-open: false #是否开启登录时验证码 (true/false)
- nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken
+ nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockTokenx
logging:
- level.root: info
- level.com.casic: info
+ level:
+ root: info
+ com.casic: info
path: logs/
- file: missiles.log
\ No newline at end of file
+ file: missiles.log
+xxl:
+ job:
+ admin:
+ addresses: http://111.198.10.15:21605/xxl-job-admin
+ accessToken: default_token
+ executor:
+ application: casic-dcms-cr-job
+ ip: 192.168.1.114
+ port: 11446
+ logPath: logs/data-generator-logs
+ logRetentionDays: 7
\ No newline at end of file