更新 UTC 时间 转成 GMT+8 东八区时间

Reviewed-on: #20

README.md

@@ -1,23 +1,4 @@
-**项目说明**
+spc 主项目
-- 这是根据renren框架重新修改出来的框架
-- 采用SpringBoot、MyBatis、spring security框架
-- 提供了代码生成器，只需编写30%左右代码，其余的代码交给系统自动生成，可快速完成开发任务
-- 代码生成器是用的Velocity模版引擎，如果需要可以在ym-generator模块中进行vm模板的修改和一些包名等基础修改
-<br>
-
-**新增业务模块需要注意**
-- 新增业务模块时，业务模块需要依赖ym-admin，并且ym-gateway模块maven需要依赖新建模块
-- 自动生成的controller接口都带鉴权注解，如果开发阶段可以先注释掉，后面开发完成之后再把鉴权添加到数据库
-<br>
-
-**技术选型：**
-- 核心框架：Spring Boot 2.7
-- 安全框架：Spring Security 
-- 持久层框架：MyBatis 3.5
-- 定时器：Quartz 2.3
-- 数据库连接池：HikariCP 
-- 日志管理：log4j2
-- 页面交互：Vue2.x
 
 <br>
 

ym-admin/src/main/java/com/cnbm/admin/config/SecurityConfig.java

@@ -73,6 +73,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
                         "/webjars/**",
                         "/websocket/**",
                         "/influx/**",
+                        "/spcData/**",
 
 //                        "/basic/**",
 //                        "/qualityPlanning/**",

ym-admin/src/main/java/com/cnbm/admin/service/impl/LoginServiceImpl.java

@@ -52,10 +52,10 @@ public class LoginServiceImpl implements LoginService {
     @Override
     public Result login(HttpServletRequest request, LoginParam loginParam) {
         //验证码是否正确
-        boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha());
+//        boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha());
-        if(!flag){
+//        if(!flag){
-            return new Result<>().error(ErrorCode.CAPTCHA_ERROR, "验证码错误");
+//            return new Result<>().error(ErrorCode.CAPTCHA_ERROR, "验证码错误");
-        }
+//        }
         UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginParam.getUsername(),loginParam.getPassword());
         Authentication authenticate = authenticationManager.authenticate(authenticationToken);
         //登录日志

ym-baisc/src/main/java/com/cnbm/basic/service/impl/FactoryServiceImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.MachineDTO;
 import com.cnbm.basic.dto.ProductTypeDTO;
 import com.cnbm.basic.entity.ProductType;
@@ -67,6 +68,7 @@ public class FactoryServiceImpl extends CrudServiceImpl<FactoryMapper, Factory,
     @Transactional(rollbackFor = Exception.class)
     public void save(FactoryDTO dto) {
         Factory entity = ConvertUtils.sourceToTarget(dto, Factory.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -74,6 +76,7 @@ public class FactoryServiceImpl extends CrudServiceImpl<FactoryMapper, Factory,
     @Transactional(rollbackFor = Exception.class)
     public void update(FactoryDTO dto) {
         Factory entity = ConvertUtils.sourceToTarget(dto, Factory.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/FeaturesStageProcedureRelationServiceImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.ProductFeaturesDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -64,6 +65,7 @@ public class FeaturesStageProcedureRelationServiceImpl extends CrudServiceImpl<F
     @Transactional(rollbackFor = Exception.class)
     public void save(FeaturesStageProcedureRelationDTO dto) {
         FeaturesStageProcedureRelation entity = ConvertUtils.sourceToTarget(dto, FeaturesStageProcedureRelation.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -71,6 +73,7 @@ public class FeaturesStageProcedureRelationServiceImpl extends CrudServiceImpl<F
     @Transactional(rollbackFor = Exception.class)
     public void update(FeaturesStageProcedureRelationDTO dto) {
         FeaturesStageProcedureRelation entity = ConvertUtils.sourceToTarget(dto, FeaturesStageProcedureRelation.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
@@ -86,6 +89,7 @@ public class FeaturesStageProcedureRelationServiceImpl extends CrudServiceImpl<F
     public void batchInsert(FeaturesStageProcedureRelationDTO[] lists) {
         for(FeaturesStageProcedureRelationDTO dto:lists){
             ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+            BaseSupportUtils.setCommonField(dto);
             save(dto);
         }
     }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/MachineServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.entity.Platform;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -95,6 +96,7 @@ public class MachineServiceImpl  extends CrudServiceImpl<MachineMapper, Machine,
     @Transactional(rollbackFor = Exception.class)
     public void save(MachineDTO dto) {
         Machine entity = ConvertUtils.sourceToTarget(dto, Machine.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -102,6 +104,7 @@ public class MachineServiceImpl  extends CrudServiceImpl<MachineMapper, Machine,
     @Transactional(rollbackFor = Exception.class)
     public void update(MachineDTO dto) {
         Machine entity = ConvertUtils.sourceToTarget(dto, Machine.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/MeasureToolServiceImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.MeasureToolDTO;
@@ -61,6 +62,7 @@ public class MeasureToolServiceImpl extends CrudServiceImpl<MeasureToolMapper, M
     @Transactional(rollbackFor = Exception.class)
     public void save(MeasureToolDTO dto) {
         MeasureTool entity = ConvertUtils.sourceToTarget(dto, MeasureTool.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -68,6 +70,7 @@ public class MeasureToolServiceImpl extends CrudServiceImpl<MeasureToolMapper, M
     @Transactional(rollbackFor = Exception.class)
     public void update(MeasureToolDTO dto) {
         MeasureTool entity = ConvertUtils.sourceToTarget(dto, MeasureTool.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/PlatformServiceImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -64,6 +65,7 @@ private PlatformMapper mapper;
     @Transactional(rollbackFor = Exception.class)
     public void save(PlatformDTO dto) {
         Platform entity = ConvertUtils.sourceToTarget(dto, Platform.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -71,6 +73,7 @@ private PlatformMapper mapper;
     @Transactional(rollbackFor = Exception.class)
     public void update(PlatformDTO dto) {
         Platform entity = ConvertUtils.sourceToTarget(dto, Platform.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFactoryRelationServiceImpl.java

@@ -2,6 +2,7 @@ package com.cnbm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.ProductWorkingprocedureRelationDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -58,6 +59,7 @@ public class ProductFactoryRelationServiceImpl extends CrudServiceImpl<ProductFa
     @Transactional(rollbackFor = Exception.class)
     public void save(ProductFactoryRelationDTO dto) {
         ProductFactoryRelation entity = ConvertUtils.sourceToTarget(dto, ProductFactoryRelation.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -65,6 +67,7 @@ public class ProductFactoryRelationServiceImpl extends CrudServiceImpl<ProductFa
     @Transactional(rollbackFor = Exception.class)
     public void update(ProductFactoryRelationDTO dto) {
         ProductFactoryRelation entity = ConvertUtils.sourceToTarget(dto, ProductFactoryRelation.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
@@ -80,6 +83,7 @@ public class ProductFactoryRelationServiceImpl extends CrudServiceImpl<ProductFa
     public void batchInsertFactory(ProductFactoryRelationDTO[] lists) {
         for(ProductFactoryRelationDTO dto:lists){
             ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+            BaseSupportUtils.setCommonField(dto);
             save(dto);
         }
     }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesHisServiceImpl.java

@@ -2,6 +2,7 @@ package com.cnbm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.ProductFeaturesHisDTO;
@@ -55,6 +56,7 @@ public class ProductFeaturesHisServiceImpl extends CrudServiceImpl<ProductFeatur
     @Transactional(rollbackFor = Exception.class)
     public void save(ProductFeaturesHisDTO dto) {
         ProductFeaturesHis entity = ConvertUtils.sourceToTarget(dto, ProductFeaturesHis.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -62,6 +64,7 @@ public class ProductFeaturesHisServiceImpl extends CrudServiceImpl<ProductFeatur
     @Transactional(rollbackFor = Exception.class)
     public void update(ProductFeaturesHisDTO dto) {
         ProductFeaturesHis entity = ConvertUtils.sourceToTarget(dto, ProductFeaturesHis.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductFeaturesServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.cnbm.admin.params.IdParam;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.*;
 import com.cnbm.basic.entity.ProductFeaturesHis;
 import com.cnbm.basic.entity.ProductWorkingprocedureRelation;
@@ -66,6 +67,7 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
     public void save(ProductFeaturesDTO dto) {
 
         ProductFeatures entity = ConvertUtils.sourceToTarget(dto, ProductFeatures.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -93,6 +95,7 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
         productFeaturesHisServiceImpl.save(history);
         //更新
         ProductFeatures entity = ConvertUtils.sourceToTarget(dto, ProductFeatures.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
 
     }
@@ -146,6 +149,7 @@ public class ProductFeaturesServiceImpl extends CrudServiceImpl<ProductFeaturesM
         for(ProductFeaturesDTO dto:lists){
             //效验数据
             ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+            BaseSupportUtils.setUpdateCommonField(dto);
             update(dto);
         }
     }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.entity.ProductType;
 import com.cnbm.basic.mapper.ProductFactoryRelationMapper;
 import com.cnbm.common.page.PageData;
@@ -96,6 +97,7 @@ public class ProductServiceImpl extends CrudServiceImpl<ProductMapper, Product,
     @Transactional(rollbackFor = Exception.class)
     public IdVo add(ProductDTO dto) {
         Product entity = ConvertUtils.sourceToTarget(dto, Product.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
         //返回新增产品id
         return IdVo.builder().id(entity.getId()).build();
@@ -105,6 +107,7 @@ public class ProductServiceImpl extends CrudServiceImpl<ProductMapper, Product,
     @Transactional(rollbackFor = Exception.class)
     public void update(ProductDTO dto) {
         Product entity = ConvertUtils.sourceToTarget(dto, Product.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductTypeServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.cnbm.admin.dto.SysDictDataDTO;
 import com.cnbm.admin.entity.SysDictDataEntity;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.constant.Constant;
 import com.cnbm.common.page.PageData;
@@ -68,6 +69,7 @@ public class ProductTypeServiceImpl extends CrudServiceImpl<ProductTypeMapper, P
     @Transactional(rollbackFor = Exception.class)
     public void save(ProductTypeDTO dto) {
         ProductType entity = ConvertUtils.sourceToTarget(dto, ProductType.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -75,6 +77,7 @@ public class ProductTypeServiceImpl extends CrudServiceImpl<ProductTypeMapper, P
     @Transactional(rollbackFor = Exception.class)
     public void update(ProductTypeDTO dto) {
         ProductType entity = ConvertUtils.sourceToTarget(dto, ProductType.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ProductWorkingprocedureRelationServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.ProductFeaturesDTO;
 import com.cnbm.basic.dto.SequenceDTO;
 import com.cnbm.basic.dto.WorkingProcedureDTO;
@@ -85,6 +86,7 @@ public class ProductWorkingprocedureRelationServiceImpl extends CrudServiceImpl<
                 Integer lastSequence = lastDto.getSequence();
                 entity.setSequence(lastSequence + 1);
             }
+            BaseSupportUtils.setCommonField(entity);
             insert(entity);
         }
         else{
@@ -96,6 +98,7 @@ public class ProductWorkingprocedureRelationServiceImpl extends CrudServiceImpl<
     @Transactional(rollbackFor = Exception.class)
     public void update(ProductWorkingprocedureRelationDTO dto) {
         ProductWorkingprocedureRelation entity = ConvertUtils.sourceToTarget(dto, ProductWorkingprocedureRelation.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
@@ -143,6 +146,7 @@ public class ProductWorkingprocedureRelationServiceImpl extends CrudServiceImpl<
     public void batchInsertWorkingprocedure(ProductWorkingprocedureRelationDTO[] lists) {
         for(ProductWorkingprocedureRelationDTO dto:lists){
             ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+            BaseSupportUtils.setCommonField(dto);
             save(dto);
         }
     }

ym-baisc/src/main/java/com/cnbm/basic/service/impl/ShiftServiceImpl.java

@@ -2,6 +2,7 @@ package com.cnbm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.ShiftDTO;
@@ -60,6 +61,7 @@ public class ShiftServiceImpl extends CrudServiceImpl<ShiftMapper, Shift, ShiftD
     @Transactional(rollbackFor = Exception.class)
     public void save(ShiftDTO dto) {
         Shift entity = ConvertUtils.sourceToTarget(dto, Shift.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -67,6 +69,7 @@ public class ShiftServiceImpl extends CrudServiceImpl<ShiftMapper, Shift, ShiftD
     @Transactional(rollbackFor = Exception.class)
     public void update(ShiftDTO dto) {
         Shift entity = ConvertUtils.sourceToTarget(dto, Shift.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/TeamServiceImpl.java

@@ -2,6 +2,7 @@ package com.cnbm.basic.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.TeamDTO;
@@ -60,6 +61,7 @@ public class TeamServiceImpl extends CrudServiceImpl<TeamMapper, Team, TeamDTO>
     @Transactional(rollbackFor = Exception.class)
     public void save(TeamDTO dto) {
         Team entity = ConvertUtils.sourceToTarget(dto, Team.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -67,6 +69,7 @@ public class TeamServiceImpl extends CrudServiceImpl<TeamMapper, Team, TeamDTO>
     @Transactional(rollbackFor = Exception.class)
     public void update(TeamDTO dto) {
         Team entity = ConvertUtils.sourceToTarget(dto, Team.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/UnitServiceImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.FactoryDTO;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
@@ -64,6 +65,7 @@ public class UnitServiceImpl extends CrudServiceImpl<UnitMapper, Unit, UnitDTO>
     @Transactional(rollbackFor = Exception.class)
     public void save(UnitDTO dto) {
         Unit entity = ConvertUtils.sourceToTarget(dto, Unit.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -71,6 +73,7 @@ public class UnitServiceImpl extends CrudServiceImpl<UnitMapper, Unit, UnitDTO>
     @Transactional(rollbackFor = Exception.class)
     public void update(UnitDTO dto) {
         Unit entity = ConvertUtils.sourceToTarget(dto, Unit.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureServiceImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.UnitDTO;
 import com.cnbm.basic.dto.WorkingProcedureTypeDTO;
 import com.cnbm.basic.entity.Machine;
@@ -107,6 +108,7 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur
     @Transactional(rollbackFor = Exception.class)
     public void save(WorkingProcedureDTO dto) {
         WorkingProcedure entity = ConvertUtils.sourceToTarget(dto, WorkingProcedure.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -114,6 +116,7 @@ public class WorkingProcedureServiceImpl extends CrudServiceImpl<WorkingProcedur
     @Transactional(rollbackFor = Exception.class)
     public void update(WorkingProcedureDTO dto) {
         WorkingProcedure entity = ConvertUtils.sourceToTarget(dto, WorkingProcedure.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-baisc/src/main/java/com/cnbm/basic/service/impl/WorkingProcedureTypeServiceImpl.java

@@ -3,6 +3,7 @@ package com.cnbm.basic.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.common.page.PageData;
 import com.cnbm.common.service.impl.CrudServiceImpl;
 import com.cnbm.basic.dto.WorkingProcedureTypeDTO;
@@ -59,6 +60,7 @@ public class WorkingProcedureTypeServiceImpl extends CrudServiceImpl<WorkingProc
     @Transactional(rollbackFor = Exception.class)
     public void save(WorkingProcedureTypeDTO dto) {
         WorkingProcedureType entity = ConvertUtils.sourceToTarget(dto, WorkingProcedureType.class);
+        BaseSupportUtils.setCommonField(entity);
         insert(entity);
     }
 
@@ -66,6 +68,7 @@ public class WorkingProcedureTypeServiceImpl extends CrudServiceImpl<WorkingProc
     @Transactional(rollbackFor = Exception.class)
     public void update(WorkingProcedureTypeDTO dto) {
         WorkingProcedureType entity = ConvertUtils.sourceToTarget(dto, WorkingProcedureType.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 

ym-common/src/main/java/com/cnbm/common/spc/util/DataUtils.java

@@ -1,6 +1,11 @@
 package com.cnbm.common.spc.util;
 
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
@@ -13,14 +18,18 @@ import java.util.List;
  */
 public class DataUtils {
     public static void main(String[] args) {
-        ArrayList<Integer> arrs = new ArrayList<>();
+//        ArrayList<Integer> arrs = new ArrayList<>();
-
+//
-        for(int i=0;i<100;i++){
+//        for(int i=0;i<100;i++){
-            arrs.add(i);
+//            arrs.add(i);
-        }
+//        }
-        List<List<Integer>> lists = fixedGroup(arrs, 10);
+//        List<List<Integer>> lists = fixedGroup(arrs, 10);
-        System.out.println();
+//        System.out.println();
-
+        LocalDateTime now = LocalDateTime.now();
+        Instant instant1 = now.atZone(ZoneId.systemDefault()).toInstant();
+        Instant instant2 = now.toInstant(ZoneOffset.UTC);
+        Instant instant3 = StringToInstant("2024-01-22 12:00:00");
+        System.out.println(instant1+" - "+instant2+" - "+instant3);
     }
 
 
@@ -46,7 +55,20 @@ public class DataUtils {
 
         return result;
     }
+    public static final Instant StringToInstant(String string) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime parse = LocalDateTime.parse(string, dateTimeFormatter);
+        //return parse.toInstant(ZoneOffset.UTC);
+        return parse.atZone(ZoneId.systemDefault()).toInstant();
+    }
 
+
+    public static final Instant StringToInstantPlus8(String string) {
+        DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+        //LocalDateTime parse = LocalDateTime.parse(string, dateTimeFormatter).plusHours(8);
+        LocalDateTime parse = LocalDateTime.parse(string, dateTimeFormatter).minusHours(8);
+        return parse.toInstant(ZoneOffset.UTC);
+    }
     public static String splitToNeed(String s,Integer type){
         String[] s1 = s.split(" ");
         String[] split = s1[0].split("-");

ym-gateway/pom.xml

@@ -86,4 +86,61 @@
         </dependency>
     </dependencies>
 
+
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.5.12</version>
+                <configuration>
+                    <!--指定运行main函数的包-->
+                    <mainClass>com.cnbm.YmApplication</mainClass>
+                    <!--开启分层编译支持-->
+                    <layers>
+                        <enabled>true</enabled>
+                        <configuration>${project.basedir}/src/main/resources/layers.xml</configuration>
+                    </layers>
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skipTests>true</skipTests>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>${docker.plugin.version}</version>
+                <configuration>
+                    <imageName>ym-pass/${project.artifactId}</imageName>
+                    <dockerDirectory>${project.basedir}/</dockerDirectory>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

ym-gateway/src/main/resources/application-dev.yml

@@ -2,9 +2,15 @@ spring:
   datasource:
       #MySQL
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: jdbc:mysql://mysql.picaiba.com:30307/spc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#      url: jdbc:mysql://mysql.picaiba.com:30307/spc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-      username: root
+#      username: root
-      password: 1qaz@WSX3edc$RFV
+#      password: 1qaz@WSX3edc$RFV
+      url: jdbc:mysql://172.16.21.131:3306/spc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+      username: spcw
+      password: fxltsblXSSXYBY
+#      url: jdbc:mysql://172.16.21.131:3306/spc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#      username: spcw
+#      password: fxltsblXSSXYBY
       #      #Oracle
       #      driver-class-name: oracle.jdbc.OracleDriver
       #      url: jdbc:oracle:thin:@192.168.10.10:1521:xe
@@ -77,4 +83,4 @@ spring:
 #  writeTimeout: 5s # Write timeout for OkHttpClient. (Default: 10s)
 #  connectTimeout: 5s # Connection timeout for OkHttpClient. (Default: 10s)
 
-  # management.health.influx.enabled=true # Whether to enable InfluxDB 2.x health check.
+# management.health.influx.enabled=true # Whether to enable InfluxDB 2.x health check.

ym-gateway/src/main/resources/application-prod.yml

@@ -2,9 +2,12 @@ spring:
   datasource:
     #MySQL
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://mysql.picaiba.com:30307/ym_pass?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#    url: jdbc:mysql://mysql.picaiba.com:30307/ym_pass?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-    username: root
+#    username: root
-    password: 1qaz@WSX3edc$RFV
+#    password: 1qaz@WSX3edc$RFV
+    url: jdbc:mysql://172.16.21.131:3306/spc?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+    username: spcw
+    password: fxltsblXSSXYBY
     #      #Oracle
     #      driver-class-name: oracle.jdbc.OracleDriver
     #      url: jdbc:oracle:thin:@192.168.10.10:1521:xe

ym-gateway/src/main/resources/application.yml

@@ -5,9 +5,9 @@ server:
     threads:
       max: 1000
       min-spare: 30
-  port: 8080
+  port: 8999
   servlet:
-    context-path: /ym-spc
+    context-path: /spcserver
     session:
       cookie:
         http-only: true
@@ -33,9 +33,12 @@ spring:
       enabled: true
   redis:
     database: 2
-    host: 127.0.0.1
+#    host: 127.0.0.1
-    port: 6379
+#    port: 6379
-    password: ''   # 密码（默认为空）
+#    password: ''
+    host: 172.16.21.99
+    port: 6380
+    password: '@WSXcde3'   # 密码（默认为空）
     timeout: 6000ms  # 连接超时时长（毫秒）
     jedis:
       pool:

ym-gateway/src/main/resources/layers.xml

@@ -0,0 +1,27 @@
+<layers xmlns="http://www.springframework.org/schema/boot/layers"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.springframework.org/schema/boot/layers
+            https://www.springframework.org/schema/boot/layers/layers.xsd">
+    <application>
+        <into layer="spring-boot-loader">
+            <include>org/springframework/boot/loader/**</include>
+        </into>
+        <into layer="application" />
+    </application>
+    <dependencies>
+        <into layer="snapshot-dependencies">
+            <include>*:*:*SNAPSHOT</include>
+        </into>
+        <into layer="company-dependencies">
+            <include>com.cnbm:*</include>
+        </into>
+        <into layer="dependencies"/>
+    </dependencies>
+    <layerOrder>
+        <layer>dependencies</layer>
+        <layer>spring-boot-loader</layer>
+        <layer>snapshot-dependencies</layer>
+        <layer>company-dependencies</layer>
+        <layer>application</layer>
+    </layerOrder>
+</layers>

ym-influx/src/main/java/com/cnbm/influx/config/InfluxClient.java

@@ -1,5 +1,6 @@
 package com.cnbm.influx.config;
 
+import com.cnbm.common.spc.util.DataUtils;
 import com.cnbm.influx.constant.Constant;
 import com.cnbm.influx.param.*;
 import com.cnbm.influx.template.Event;
@@ -19,8 +20,10 @@ public enum InfluxClient {
     /**
      * influxdb 读写客户端，，如果write比较繁忙，后续可以考虑，维护 client一个线程池。
      * */
-    Client("http://192.168.0.170:8086","lkBsC27QZr1W50BSPlGxpTqNNpwuUk5uz1dZZRPSPbCG5VmNDDUo8P3UkZIhGWwfJwkuz6ZGZ7Et4_KBaG3gHw==","qgs","qgs-bucket"),
+    //Client("http://192.168.0.171:8086","lkq32gtomiKd4nu-kwZVUBEbn1HLdigjRPfuA6p8c29KFfqRs8JcR3IDLDsKzVFA-TDHbG1W6EP3EcJKKqpDPg==","qgs","qgs-bucket"),
 
+    //瑞昌-cdte  spc-all-token
+    Client("http://172.16.21.111:8086","XLTjiVj368gLL0j-hTcAS6HE17M7tY5fj3ipt1gXTjgVqdGRE5pEhpGMABzchYFZpmaQsGTUckR5Rs8Erz8nKQ==","qgs","qgs-bucket"),
     ;
     private String url;
     private String token;
@@ -116,6 +119,8 @@ public enum InfluxClient {
                         .addTag("argName", event.getArgName())
                         .addField("argValue", event.getArgValue())
                         .time(event.getTime().toEpochMilli(), WritePrecision.MS);
+                        //.time(DataUtils.StringToInstantPlus8(event.getTime().toString()).toEpochMilli(), WritePrecision.MS);
+
             }else {
                 point = Point.measurement(measurement)
                         .addTag("transationId", event.getTransationId()==null ? "" : event.getTransationId())
@@ -128,9 +133,8 @@ public enum InfluxClient {
                         .addTag("argName", event.getArgName())
                         .addField("argValue", event.getArgValue())
                         .time(event.getTime().toEpochMilli(), WritePrecision.MS);
+                        //.time(DataUtils.StringToInstantPlus8(event.getTime().toString()).toEpochMilli(), WritePrecision.MS);
             }
-
-
             list.add(point);
         }
         writeApi.writePoints(list);

ym-influx/src/main/java/com/cnbm/influx/controller/S7DemoController.java

@@ -29,6 +29,27 @@ public class S7DemoController {
     private static final Logger logger = LoggerFactory.getLogger(S7DemoController.class);
 
 
+    //for 常规计量型
+    @PostMapping("/insertDemoDataForMetering")
+    public void insertDemoDataForMetering() throws InterruptedException {
+        List<Event> list = new ArrayList<>();
+        Random r = new Random();
+
+        for(int i=0;i<999;i++){
+            Thread.sleep(10);
+            Event event = new Event();
+            event.setTime(DataUtils.getAfterDate(i).toInstant());
+            event.setTransationId("forbatch"+i);
+            event.setArgName("LTWeight");
+            Double d = r.nextDouble() * 2.5  + 66;
+            event.setArgValue(d.toString());
+
+            event.setInspectionSheetId(i+"");
+            list.add(event);
+        }
+        InfluxClient.Client.batchInsert(list,"Weight");
+    }
+
     //for 常规计数型
     @PostMapping("/insertDemoDataForCount")
     public void insertDemoDataForCount() throws InterruptedException {
@@ -148,26 +169,7 @@ public class S7DemoController {
     }
 
 
-    //for 常规计量型
-    @PostMapping("/insertDemoDataForMetering")
-    public void insertDemoDataForMetering() throws InterruptedException {
-        List<Event> list = new ArrayList<>();
-        Random r = new Random();
 
-        for(int i=0;i<99;i++){
-            Thread.sleep(10);
-            Event event = new Event();
-            event.setTime(Instant.now());
-            event.setTransationId("forbatch"+i);
-            event.setArgName("LTWeight");
-            Double d = r.nextDouble() * 2.5  + 66;
-            event.setArgValue(d.toString());
-
-            event.setInspectionSheetId(i+"");
-            list.add(event);
-        }
-        InfluxClient.Client.batchInsert(list,"Weight");
-    }
 //
 //    @PostMapping("/insertBatchJYD")
 //    public void insertBatchJYD() throws InterruptedException {

ym-influx/src/main/java/com/cnbm/influx/param/BaseParam.java

@@ -16,7 +16,7 @@ public class BaseParam implements Serializable {
     //page 信息可选
     private PageInfo pageInfo;
 
-    @NotEmpty(message = "measurement 不能为空")
+    @NotEmpty(message = "measurement 不能为空, 设备名（一个设备一个measurement，一个表）")
     private String measurement;
 
     @NotNull(message = "查询时间段不能为空")

ym-process-inspection/src/main/java/com/cnbm/processInspection/controller/ProcessInspectionController.java

@@ -142,44 +142,6 @@ public class ProcessInspectionController {
         return R.ok("成功",xmrGraphData);
     }
 
-//    @PostMapping("/getBatchs")
-//    public R<List<String>> getBatchs() throws InterruptedException {
-//        List<Event> list = new ArrayList<>();
-//        Random r = new Random();
-//        Instant instant = DataUtils.getBeforeDate(400).toInstant();
-//        List<String> res = new ArrayList<>();
-//
-//        QueryDataParam queryDataParam = new QueryDataParam();
-//        queryDataParam.setBucket("qgs-bucket");
-//        queryDataParam.setMeasurement("Weight");
-//        List<String> dropNames = new ArrayList<>();
-//        dropNames.add("transationId");
-//        dropNames.add("_value");
-//        dropNames.add("_start");
-//        dropNames.add("_stop");
-//        dropNames.add("_time");
-//        dropNames.add("_field");
-//        dropNames.add("_measurement");
-//        dropNames.add("inspectionSheetId");
-//        dropNames.add("argName");
-//        queryDataParam.setDropedTagNames(dropNames);
-//
-//        queryDataParam.setTags(Arrays.asList(new Tag("argName","LTWeight")));
-//
-//        queryDataParam.setRange(new Range(DataUtils.getBeforeDate(100).toInstant(),Instant.now()));
-////        queryDataParam.setPageInfo(new PageInfo(1,10));
-//        List<FluxTable> query = InfluxClient.Client.queryByGroup(queryDataParam);
-//
-//
-//        for (FluxTable fluxTable : query) {
-//            List<FluxRecord> records = fluxTable.getRecords();
-//            if(records.size()!=0){
-//                res.add((String) records.get(0).getValueByKey("batchNum"));
-//                continue;
-//            }
-//        }
-//        return R.ok(res);
-//    }
 
 
     @PostMapping("/NPGraphTest")
@@ -220,7 +182,8 @@ public class ProcessInspectionController {
         QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam();
 //        queryDataParam.setMeasurement(Constant.measurement);
         queryDataParam.setMeasurement(graphArg.getProcedureName());
-        queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() ));
+        //queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() ));
+        queryDataParam.setRange(new Range( DataUtils.StringToInstant(graphArg.getBegin()) , DataUtils.StringToInstant(graphArg.getEnd()) ));
         queryDataParam.setTimeType(graphArg.getGroupType());
         npGraph.initialDate(queryDataParam);
 
@@ -348,7 +311,9 @@ public class ProcessInspectionController {
         QueryDataParam queryDataParam = new QueryDataParam();
 //        queryDataParam.setMeasurement(Constant.measurement);
         queryDataParam.setMeasurement(graphArg.getProcedureName());
-        queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant()));
+        //queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant()));
+        queryDataParam.setRange(new Range( DataUtils.StringToInstant(graphArg.getBegin()) , DataUtils.StringToInstant(graphArg.getEnd()) ));
+
         meanStandardDeviationGraph.initialDate(queryDataParam);
 
         XbarSGraphData xbarSGraphData = new XbarSGraphData(
@@ -385,7 +350,8 @@ public class ProcessInspectionController {
 //        queryDataParam.setMeasurement(Constant.measurement);
         queryDataParam.setMeasurement(graphArg.getProcedureName());
 
-        queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant()));
+        //queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant()));
+        queryDataParam.setRange(new Range( DataUtils.StringToInstant(graphArg.getBegin()) , DataUtils.StringToInstant(graphArg.getEnd()) ));
         meanRGraph.initialDate(queryDataParam);
 
 
@@ -421,7 +387,8 @@ public class ProcessInspectionController {
         QueryDataParam queryDataParam = new QueryDataParam();
 //        queryDataParam.setMeasurement(Constant.measurement);
         queryDataParam.setMeasurement(graphArg.getProcedureName());
-        queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant()));
+        //queryDataParam.setRange(new Range(graphArg.getBegin().toInstant(), graphArg.getEnd().toInstant()));
+        queryDataParam.setRange(new Range( DataUtils.StringToInstant(graphArg.getBegin()) , DataUtils.StringToInstant(graphArg.getEnd()) ));
         xmrGraph.initialDate(queryDataParam);
 
         XMRGraphData xmrGraphData = new XMRGraphData(
@@ -451,7 +418,8 @@ public class ProcessInspectionController {
         QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam();
 //        queryDataParam.setMeasurement(Constant.measurement);
         queryDataParam.setMeasurement(graphArg.getProcedureName());
-        queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() ));
+        //queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() ));
+        queryDataParam.setRange(new Range( DataUtils.StringToInstant(graphArg.getBegin()) , DataUtils.StringToInstant(graphArg.getEnd()) ));
         queryDataParam.setTimeType(graphArg.getGroupType());
         pGraph.initialDate(queryDataParam);
 
@@ -473,7 +441,8 @@ public class ProcessInspectionController {
         QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam();
 //        queryDataParam.setMeasurement(Constant.measurement);
         queryDataParam.setMeasurement(graphArg.getProcedureName());
-        queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() ));
+        //queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() ));
+        queryDataParam.setRange(new Range( DataUtils.StringToInstant(graphArg.getBegin()) , DataUtils.StringToInstant(graphArg.getEnd()) ));
         queryDataParam.setTimeType(graphArg.getGroupType());
         cGraph.initialDate(queryDataParam);
 
@@ -496,7 +465,8 @@ public class ProcessInspectionController {
         QueryDataGroupByTimeParam queryDataParam = new QueryDataGroupByTimeParam();
 //        queryDataParam.setMeasurement(Constant.measurement);
         queryDataParam.setMeasurement(graphArg.getProcedureName());
-        queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() ));
+        //queryDataParam.setRange(new Range( graphArg.getBegin().toInstant() , graphArg.getEnd().toInstant() ));
+        queryDataParam.setRange(new Range( DataUtils.StringToInstant(graphArg.getBegin()) , DataUtils.StringToInstant(graphArg.getEnd()) ));
         queryDataParam.setTimeType(graphArg.getGroupType());
         uGraph.initialDate(queryDataParam);
 

ym-process-inspection/src/main/java/com/cnbm/processInspection/dto/GraphArg.java

@@ -23,15 +23,25 @@ public class GraphArg {
     @NotNull(message = "检验特性Id 不能为空")
     private Long productFeaturesId;
 
+//    @ApiModelProperty(value = "查询时间段，开始")
+//    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+//    @NotNull(message = "时间段，开始 不能为空")
+//    private Date begin;
+//
+//    @ApiModelProperty(value = "查询时间段，结束")
+//    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+//    @NotNull(message = "时间段，结束 不能为空")
+//    private Date end;
+
     @ApiModelProperty(value = "查询时间段，开始")
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "时间段，开始 不能为空")
-    private Date begin;
+    private String begin;
 
     @ApiModelProperty(value = "查询时间段，结束")
-    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd")
+    @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "时间段，结束 不能为空")
-    private Date end;
+    private String end;
 
     @ApiModelProperty(value = "判读方案列表,只用于 计量型")
     private List<InterpretationListArg> interpretationScheme;

ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/forCount/c/CGraph.java

@@ -110,6 +110,9 @@ public class CGraph {
         queryDataParam.setTags(Arrays.asList(new Tag("argName",argName)));
 
         List<FluxTable> query = InfluxClient.Client.queryGroupByTime(queryDataParam);
+        if(query.size() == 0){
+            return;
+        }
         //1. 先从fluxdb 里面提取原始数据
         //计算p bar
         this.cbar = computeCbar(query);

ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/forCount/np/NPGraph.java

@@ -104,6 +104,9 @@ public class NPGraph {
 
         queryDataParam.setTags(Arrays.asList(new Tag("argName",argName)));
         List<FluxTable> query = InfluxClient.Client.queryGroupByTime(queryDataParam);
+        if(query.size() == 0){
+            return;
+        }
         //1. 先从fluxdb 里面提取原始数据
         List<Double> originData = new ArrayList<>();
         //计算p bar

ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/forCount/p/PGraph.java

@@ -115,6 +115,9 @@ public class PGraph {
         queryDataParam.setTags(Arrays.asList(new Tag("argName",argName)));
 
         List<FluxTable> query = InfluxClient.Client.queryGroupByTime(queryDataParam);
+        if(query.size() == 0){
+            return;
+        }
         //1. 先从fluxdb 里面提取原始数据
         //计算p bar
         this.pbar = computePbar(query);

ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/forCount/u/UGraph.java

@@ -114,6 +114,9 @@ public class UGraph {
 
         queryDataParam.setTags(Arrays.asList(new Tag("argName",argName)));
         List<FluxTable> query = InfluxClient.Client.queryGroupByTime(queryDataParam);
+        if(query.size() == 0){
+            return;
+        }
         //1. 先从fluxdb 里面提取原始数据
         //计算p bar
         this.ubar = computeUbar(query);

ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/forMeterage/ms/MeanStandardDeviationGraph.java

@@ -103,8 +103,12 @@ public class MeanStandardDeviationGraph {
         queryDataParam.setTags(Arrays.asList(new Tag("argName",argName)));
 
         List<FluxTable> query = InfluxClient.Client.query(queryDataParam);
+        if(query.size() == 0){
+            return;
+        }
         //1. 先从fluxdb 里面提取原始数据
         List<Double> originData = new ArrayList<>();
+
         for (FluxTable fluxTable : query) {
             List<FluxRecord> records = fluxTable.getRecords();
             for (FluxRecord fluxRecord : records) {

ym-process-inspection/src/main/java/com/cnbm/processInspection/graphAnalyzed/forMeterage/xmr/XMRGraph.java

@@ -100,6 +100,9 @@ public class XMRGraph {
 
 
         List<FluxTable> query = InfluxClient.Client.query(queryDataParam);
+        if(query.size() == 0){
+            return;
+        }
         //1. 先从fluxdb 里面提取原始数据
         List<Double> originData = new ArrayList<>();
         for (FluxTable fluxTable : query) {

ym-process-inspection/src/main/java/com/cnbm/processInspection/service/impl/InspectionSheetServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.cnbm.admin.utils.BaseSupportUtils;
 import com.cnbm.basic.dto.ProductFeaturesDTO;
 import com.cnbm.basic.dto.WorkingProcedureDTO;
 import com.cnbm.basic.entity.*;
@@ -39,10 +40,8 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.annotation.Resource;
-import java.time.Instant;
+import java.time.*;
-import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -79,6 +78,12 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
         String batchNumber = (String) params.get("batchNumber");
 
         QueryWrapper<InspectionSheet> wrapper = new QueryWrapper<>();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        if( ObjectUtils.isNotNull(params.get("startTime")) &&  ObjectUtils.isNotNull(params.get("endTime"))){
+            LocalDateTime startTime = LocalDate.parse(params.get("startTime").toString(),df).atStartOfDay();
+            LocalDateTime endTime = LocalDate.parse(params.get("endTime").toString(),df).atStartOfDay();
+            wrapper.between(startTime!=null && endTime!=null,"create_time", startTime, endTime);
+        }
         wrapper.like(ObjectUtils.isNotNull(id), "id", id);
         wrapper.like(StringUtils.isNotBlank(inspectionSite), "inspection_stage", inspectionSite);
         wrapper.like(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
@@ -187,6 +192,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
         //InspectionSheet entity = ConvertUtils.sourceToTarget(dto, InspectionSheet.class);
         InspectionSheet entity =  new InspectionSheet();
         BeanUtils.copyProperties(dto, entity);
+        BaseSupportUtils.setCommonField(entity);
         return entity;
     }
 
@@ -194,6 +200,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
     @Transactional(rollbackFor = Exception.class)
     public void update(InspectionSheetDTO dto) {
         InspectionSheet entity = ConvertUtils.sourceToTarget(dto, InspectionSheet.class);
+        BaseSupportUtils.setUpdateCommonField(entity);
         updateById(entity);
     }
 
@@ -389,6 +396,7 @@ public class InspectionSheetServiceImpl extends CrudServiceImpl<InspectionSheetM
             updateDto.setId(inspectionSheetId);
             updateDto.setNumberOfDefects(numberOfDefects);
             updateDto.setDefectiveQuantity(defectiveQuantity);
+            BaseSupportUtils.setUpdateCommonField(updateDto);
             update(updateDto);
         }
     }