添加重新计算接口

src/main/java/cn/lihongjie/coal/weightDeviceData/controller/WeightDeviceDataController.java

@@ -69,6 +69,13 @@ public class WeightDeviceDataController {
     }
 
 
+
+    @PostMapping("/recalculate")
+    public Object recalculate(@RequestBody IdRequest request) {
+        this.service.recalculate(request);
+        return true;
+    }
+
     @PostMapping("/archive")
     public Object archive(@RequestBody IdRequest request) {
         this.service.archive(request);

src/main/java/cn/lihongjie/coal/weightDeviceData/service/WeightDeviceDataService.java

@@ -303,18 +303,16 @@ where 更新时间>='%s' and 更新时间<='%s'
             throw new BizException("部分数据已归档，无法编辑或删除");
         }
 
-        Object cnt = em.createQuery("select count(1) from PurchaseOrderEntity  p join p.weightDataList w where w.id in :ids")
+        Object cnt =
-                .setParameter("ids", request.getIds())
+                em.createQuery(
-                .getSingleResult();
+                                "select count(1) from PurchaseOrderEntity  p join p.weightDataList w where w.id in :ids")
+                        .setParameter("ids", request.getIds())
+                        .getSingleResult();
 
-
+        if (Integer.parseInt(cnt.toString()) > 0) {
-        if (Integer.parseInt(cnt.toString()) > 0){
             throw new BizException("部分数据已经被采购单引用, 无法删除");
         }
 
-
-
-
         this.repository.deleteAllById(request.getIds());
     }
 
@@ -326,12 +324,8 @@ where 更新时间>='%s' and 更新时间<='%s'
 
     public Page<WeightDeviceDataDto> list(CommonQuery query) {
 
-
         Specification specification = query.specification(conversionService);
 
-
-       
-
         Page<WeightDeviceDataEntity> page =
                 repository.findAll(
                         specification.and(
@@ -363,15 +357,54 @@ where 更新时间>='%s' and 更新时间<='%s'
         this.repository.unArchive(dto);
     }
 
+    public void recalculate(IdRequest id) {
+        List<WeightColumnConfigEntity> configs = getConfigs(Ctx.currentUser().getOrganizationId());
+
+        if (CollectionUtils.isEmpty(configs)) {
+
+            return;
+        }
+        for (WeightDeviceDataEntity entity : this.findAllByIds(id.getIds())) {
+
+            if (!CollectionUtils.isEmpty(configs)) {
+
+                for (WeightColumnConfigEntity config : configs) {
+
+                    if (StringUtils.isNotBlank(config.getScript())) {
+
+                        Object result = null;
+
+                        try {
+
+                            result =
+                                    GroovyScriptUtils.exec(
+                                            config.getScript(), BeanUtil.beanToMap(entity));
+                        } catch (Exception e) {
+                            log.error(
+                                    "exec script error {} {}",
+                                    config.getCode(),
+                                    config.getScript(),
+                                    e);
+                        }
+
+                        try {
+
+                            ReflectUtils.writeField(entity, config.getCode(), result);
+                        } catch (Exception e) {
+                            log.error("write field error {}", config.getCode(), e);
+                        }
+                    }
+                }
+            }
+
+            super.save(entity);
+        }
+    }
+
     @Override
     public WeightDeviceDataEntity save(WeightDeviceDataEntity entity) {
 
-        List<WeightColumnConfigEntity> configs =
+        List<WeightColumnConfigEntity> configs = getConfigs(entity.getOrganizationId());
-                em.createQuery(
-                                "select w from WeightColumnConfigEntity  w where w.organizationId = :organizationId and w.script is not null and length(w.script) > 0 and w.status = 1 order by w.sortKey asc ",
-                                WeightColumnConfigEntity.class)
-                        .setParameter("organizationId", entity.getOrganizationId())
-                        .getResultList();
 
         if (!CollectionUtils.isEmpty(configs)) {
 
@@ -387,7 +420,8 @@ where 更新时间>='%s' and 更新时间<='%s'
                                 GroovyScriptUtils.exec(
                                         config.getScript(), BeanUtil.beanToMap(entity));
                     } catch (Exception e) {
-                        log.error("exec script error {} {}", config.getCode(), config.getScript(), e);
+                        log.error(
+                                "exec script error {} {}", config.getCode(), config.getScript(), e);
                     }
 
                     try {
@@ -403,6 +437,14 @@ where 更新时间>='%s' and 更新时间<='%s'
         return super.save(entity);
     }
 
+    private List<WeightColumnConfigEntity> getConfigs(String organizationId) {
+        return em.createQuery(
+                        "select w from WeightColumnConfigEntity  w where w.organizationId = :organizationId and w.script is not null and length(w.script) > 0 and w.status = 1 order by w.sortKey asc ",
+                        WeightColumnConfigEntity.class)
+                .setParameter("organizationId", organizationId)
+                .getResultList();
+    }
+
     public Page report(WeightDeviceDataReportRequest request) {
 
         if (StringUtils.isEmpty(request.getTimeDimension())) {