diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/ConcurrentTaskServcie.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/ConcurrentTaskServcie.java index e7b1eb7..c3827cc 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/ConcurrentTaskServcie.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/job/service/impl/ConcurrentTaskServcie.java @@ -145,7 +145,7 @@ public class ConcurrentTaskServcie extends TaskJobService implements ITaskJobSer clock.setUpdateUser(object.getCreateUser()); clock.setTenantId(object.getTenantId()); clock.setTaskId(task.getId()); - clock.setObjectId(object.getId()); + clock.setObjectId(object.getObjectId()); clock.setPlanStartTime(task.getPlanStartTime()); clock.setPlanEndTime(task.getPlanEndTime()); clock.setClockPerson(userId); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/ClockInMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/ClockInMapper.xml index 36b4108..5a97018 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/ClockInMapper.xml +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/mapper/ClockInMapper.xml @@ -5,7 +5,7 @@ SELECT CLOCK_PERSON, SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS incomplete, - SUM(CASE WHEN status = 1 THEN 1 ELSE 0 END) AS complete + SUM(CASE WHEN status = 1 THEN 1 ELSE + 0 END) AS complete FROM HZ_ST_EX_CLOCK_IN IS_DELETED = 0 diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java index 86e0ed5..9de251e 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskServiceImpl.java @@ -295,7 +295,7 @@ public class TaskServiceImpl extends ServiceImpl impleme clock.setUpdateUser(object.getCreateUser()); clock.setTenantId(object.getTenantId()); clock.setTaskId(task.getId()); - clock.setObjectId(object.getId()); + clock.setObjectId(object.getObjectId()); clock.setPlanStartTime(task.getPlanStartTime()); clock.setPlanEndTime(task.getEndTime()); clock.setClockPerson(userId); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/ClockInEventVO.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/ClockInEventVO.java index cd00ca6..1d68af8 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/ClockInEventVO.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/vo/ClockInEventVO.java @@ -21,5 +21,6 @@ public class ClockInEventVO implements Serializable{ private static final long serialVersionUID = -904847315218750903L; - + @ApiModelProperty(value = "巡检巡检集合") + private List events; } diff --git a/hzims-service/inspect/src/main/resources/application-dev.yml b/hzims-service/inspect/src/main/resources/application-dev.yml deleted file mode 100644 index 80c761c..0000000 --- a/hzims-service/inspect/src/main/resources/application-dev.yml +++ /dev/null @@ -1,108 +0,0 @@ -#服务器端口 -server: - port: 8131 -#数据源配置 -spring: - datasource: - url: jdbc:mysql://175.6.40.67:5816/hzims_inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true - # url: jdbc:mysql://192.168.65.86:3306/hzims_inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true - username: root - password: 123 - - -swagger: - base-packages: - - org.springbalde - - com.hnac - -xxl: - job: - accessToken: '' - admin: - addresses: http://192.168.65.152:7009/xxl-job-admin - executor: - appname: hzims-inspect - ip: 192.168.65.172 - logpath: /data/applogs/xxl-job/jobhandler - logretentiondays: -1 - port: 8121 - -#oss配置 -oss: - enabled: true - name: minio - tenant-mode: false - endpoint: http://175.6.40.67:19000 - bucket-name: hzims-inspect - access-key: CHI7BJS991FEZZCB3U0R - secret-key: fjcR2RoQxZ4eTmOaB54rkITZjn/YVJhJZlckHxy/ - - -hzinfo: - task: - pdf: - # pdf模板路径 ，请配置绝对路径 - # module-path: /data/inspect/pdf/templet/inspectObj.html # linux - module-path: D:\data\hzinfo\templet\inspectObj.html # windows - # pdf文件存储路径，请配置绝对路径 - # file-path: /data/inspect/pdf/file # linux - file-path: D:/data/hzinfo/file # windows - - -hzims: - redis: - key: - taskEndRemind: 200000:hzims:inspect:task:end:remind - tasks: - flag: 1 - inspect: - ai: - # 文件外网访问路径 - replace-url: http://175.6.40.67:19000 - rabbit-mq-send-topic: inspect_task_send_ia_task - face: - # 人脸识别服务地址 - url: http://192.168.65.249:9876 - # 越小精度越高 - ratio: 0.6 - video: - # 文件内网访问路径 - minio-url: http://192.168.65.246:8585 - task: - #短信模块code - templateCode: - #巡检任务开始前发送短信信息阿里云模板 - taskBegin: aliyun-task-begin - #巡检任务结束前发送短信信息阿里云模板 - taskEnd: aliyun-task-end - #巡检消息推送模板 - 极光 - jgPushCode: hzinfo-inspect - -offline: - temp: - dowload: /data/hzims/temp/offline/download - sync: /data/hzims/temp/offline/sync - maxSize: 1048576000 - -blade: - mqtt: - enabled: true - userName: hzinfo - password: hz123456 - urls: tcp://121.4.245.170:18883 - clientId: hzinfo_inspect - topicNames: topic_ai_events - -#sms: -# aliyun: -# connectTimeout: 10000 -# readTimeout: 10000 -# proxyDomain: 175.6.40.67:37880 -# accessKeyId: 7262257e6dd16e85ddfee09d3e8eedaa -# accessKeySecret: 7dba15f64eba724521d0ecd4c02a8a3e49f3ffa95ff75d63a3c4a88a1679282b173e5c13ddbba3eb2699a65a1be1b32b -# profilePoint: cn-changsha -# endPoint: cn-changsha -# signName: 华自科技 - - - diff --git a/hzims-service/inspect/src/main/resources/application-prod.yml b/hzims-service/inspect/src/main/resources/application-prod.yml deleted file mode 100644 index dc9c50c..0000000 --- a/hzims-service/inspect/src/main/resources/application-prod.yml +++ /dev/null @@ -1,38 +0,0 @@ -#服务器端口 -server: - port: 8120 - -#数据源配置 -spring: - datasource: - url: ${blade.datasource.inspect.prod.url} - username: ${blade.datasource.inspect.prod.username} - password: ${blade.datasource.inspect.prod.password} -swagger: - base-packages: - - org.springbalde - - com.hnac - - -#oss配置 -oss: - enabled: true - name: minio - tenant-mode: false - endpoint: http://175.6.40.67:19000 - bucket-name: hzims-inspect - access-key: CHI7BJS991FEZZCB3U0R - secret-key: fjcR2RoQxZ4eTmOaB54rkITZjn/YVJhJZlckHxy/ - -hzims: - redis: - key: - taskEndRemind: hzims:inspect:task:end:remind - tasks: - flag: 1 - inspect: - face: - # 人脸识别服务地址 - url: http://192.168.65.249:9876 - # 越小精度越高 - ratio: 0.6 diff --git a/hzims-service/inspect/src/main/resources/application-test.yml b/hzims-service/inspect/src/main/resources/application-test.yml deleted file mode 100644 index 3dce211..0000000 --- a/hzims-service/inspect/src/main/resources/application-test.yml +++ /dev/null @@ -1,92 +0,0 @@ -#服务器端口 -server: - port: 8131 -#数据源配置 -spring: - datasource: - url: jdbc:mysql://175.6.40.67:10017/hzims_inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true -# url: jdbc:mysql://192.168.65.86:3306/hzims_inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true&allowPublicKeyRetrieval=true - username: root - password: 123 - - -swagger: - base-packages: - - org.springbalde - - com.hnac - -xxl: - job: - accessToken: '' - admin: - addresses: http://192.168.65.152:7009/xxl-job-admin - executor: - appname: hzims-inspect - ip: 192.168.65.172 - logpath: /data/applogs/xxl-job/jobhandler - logretentiondays: -1 - port: 8121 - -#oss配置 -oss: - enabled: true - name: minio - tenant-mode: false - endpoint: http://175.6.40.67:19000 - bucket-name: hzims-inspect - access-key: CHI7BJS991FEZZCB3U0R - secret-key: fjcR2RoQxZ4eTmOaB54rkITZjn/YVJhJZlckHxy/ - - -hzinfo: - task: - pdf: - # pdf模板路径 ，请配置绝对路径 - # module-path: /data/inspect/pdf/templet/inspectObj.html # linux - module-path: D:\data\hzinfo\templet\inspectObj.html # windows - # pdf文件存储路径，请配置绝对路径 - # file-path: /data/inspect/pdf/file # linux - file-path: D:/data/hzinfo/file # windows - - -hzims: - tasks: - flag: 1 - inspect: - ai: - # 文件外网访问路径 - replace-url: http://175.6.40.67:19000 - face: - # 人脸识别服务地址 - url: http://192.168.65.249:9876 - # 越小精度越高 - ratio: 0.6 - video: - # 文件内网访问路径 - minio-url: http://192.168.65.246:8585 - task: - #短信模块code - templateCode: - #巡检任务开始前发送短信信息阿里云模板 - taskBegin: aliyun-task-begin - #巡检任务结束前发送短信信息阿里云模板 - taskEnd: aliyun-task-end - #巡检消息推送模板 - 极光 - jgPushCode: hzinfo-inspect - - - - -#sms: -# aliyun: -# connectTimeout: 10000 -# readTimeout: 10000 -# proxyDomain: 175.6.40.67:37880 -# accessKeyId: 7262257e6dd16e85ddfee09d3e8eedaa -# accessKeySecret: 7dba15f64eba724521d0ecd4c02a8a3e49f3ffa95ff75d63a3c4a88a1679282b173e5c13ddbba3eb2699a65a1be1b32b -# profilePoint: cn-changsha -# endPoint: cn-changsha -# signName: 华自科技 - - - diff --git a/hzims-service/inspect/src/main/resources/template/template.yml b/hzims-service/inspect/src/main/resources/template/template.yml deleted file mode 100644 index b76ac2c..0000000 --- a/hzims-service/inspect/src/main/resources/template/template.yml +++ /dev/null @@ -1,131 +0,0 @@ -#服务器端口 -server: - port: 8132 - -##oss配置 -oss: - enabled: true - name: minio - tenant-mode: false - bucket-name: prd200000 - endpoint: ${hzinfo.oss.endpoint} - access-key: ${hzinfo.oss.access-key} - secret-key: ${hzinfo.oss.secret-key} - -#数据源配置 -spring: - #排除DruidDataSourceAutoConfigure - autoconfigure: - exclude: com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DruidDataSourceAutoConfigure - datasource: - url: jdbc:mysql://${hzinfo.db.busines.ip}:${hzinfo.db.busines.port}/hzims-inspect?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&tinyInt1isBit=false&allowMultiQueries=true&serverTimezone=GMT%2B8&allowPublicKeyRetrieval=true - username: ${hzinfo.db.busines.username} - password: ${hzinfo.db.busines.password} - - -#mybatis-plus配置 -mybatis-plus: - mapper-locations: classpath:com/hnac/hzims/**/mapper/*Mapper.xml - #实体扫描，多个package用逗号或者分号分隔 - typeAliasesPackage: com.hnac.hzims.**.entity - -#swagger扫描路径配置 -swagger: - base-packages: com.hnac.hzims.inspect, - org.springbalde - -xxl: - job: - auto: - registry: 1 - accessToken: 'hzinfo88238888!' - admin: - addresses: http://${hzims.xxljob.ip}:${hzims.xxljob.port}/xxl-job-admin - executor: - appname: hzinfo-inspect - ip: ${hzims.server.ip} - logpath: /data/applogs/xxl-job/jobhandler - logretentiondays: 7 - port: 28132 - - -hzinfo: - redis: - key: - taskEndRemind: hzims:inspect:task:end:remind - task: - pdf: - # pdf模板路径 ，请配置绝对路径 - module-path: /data/inspect/pdf/templet/inspectObj.html - # pdf文件存储路径，请配置绝对路径 - file-path: /data/inspect/pdf/file - -hzims: - tasks: - flag: 1 - inspect: - ai: - # 文件外网访问路径 - replace-url: http://175.6.40.67:19000 - rabbit-mq-send-topic: inspect_task_send_ia_task - face: - # 人脸识别服务地址 - url: http://192.168.65.249:9876 - # 越小精度越高 - ratio: 0.6 - video: - # 文件内网访问路径 - minio-url: http://192.168.1.26:9000 - task: - #短信模块code - templateCode: - #巡检任务开始前发送短信信息阿里云模板 - taskBegin: aliyun-task-begin - taskBeginV2: inspect-task-remind - #巡检任务结束前发送短信信息阿里云模板 - taskEnd: aliyun-task-end - #巡检消息推送模板 - 极光 - jgPushCode: hzinfo-inspect - offline: - download: - path: /data/inspect/offline/download - table: HZ_ST_EX_TASK_USER,HZ_ST_EX_TASK,HZ_ST_RE_PLAN,HZ_ST_EX_EVENT,HZ_ST_EVENT_ATTACHMENT,HZ_ST_EX_EVENT_RECORD,HZ_ST_EX_OBJECT,HZ_ST_EX_OBJECT_PROJECT,HZ_ST_EX_OBJECT_PROJECT_CONTENT,HZ_ST_RE_OBJECT,HZ_ST_RE_PROJECT,HZ_ST_RE_CONTENT,HZ_ST_RE_OBJECT_DANGER,HZ_OFFLINE_TASK - upload: - path: /data/inspect/offline/upload - -offline: - temp: - download: /data/hzims/temp/offline/download - sync: /data/hzims/temp/offline/sync - max-size: 1073741824 - -logging: - level: - com.hnac.hzinfo.inspect: DEBUG -feign: - client: - config: - # feign全局日志级别 - default: - loggerLevel: FULL - -blade: - data-scope: - enabled: false - mqtt: - enabled: true - userName: ${hzinfo.mq.username} - password: ${hzinfo.mq.password} - urls: tcp://${hzinfo.mq.ip}:${hzinfo.mq.port} - clientId: hzinfo_inspect - topicNames: topic_ai_events - data: - sdk: - enabled: true - url: http://${hzims.sdk.ip}/api/hzinfo-data-config - ctrlUrl: http://${hzims.sdk.ip}/api/hzinfo-data-handler - appId: ${hzims.sdk.appId} - appSecret: ${hzims.sdk.appSecret} - redisIp: ${hzims.sdk.redisIp} - redisPort: ${hzims.sdk.redisPort} - password: ${hzims.sdk.password} - maxKeys: 1000