lrl -2021-11-18

src/main/java/com/steerinfo/ems/emscalpointvalue/mapper/EmsCalpointValueMapper.xml

@@ -318,7 +318,7 @@
     c.apportvalue,
     c.bz,
     case
-    when clock = '2021-11-14' then
+    when clock = #{clockt} then
     1
     else
     0
@@ -333,7 +333,7 @@
     on t.itemid = c.itemid
     where t.itemid in (${itemid}) and mintimegranid = 'DAY'
     and t.itemid not in
-    (select itemid from EMS_CALPOINT_VALUE where clock = #{clockt})
+    (select itemid from EMS_CALPOINT_VALUE where clock = #{clock})
     <if test="itemid2 != null and itemid2 != ''">
       and t.itemid = #{itemid2}
     </if>
@@ -386,7 +386,7 @@
     c.apportvalue,
     c.bz,
     case
-    when clock = '2021-11-14' then
+    when clock = #{clockt} then
     1
     else
     0

src/main/java/com/steerinfo/ems/emscalpointvalue/service/impl/EmsCalpointValueServiceImpl.java

@@ -59,14 +59,16 @@ public class EmsCalpointValueServiceImpl extends BaseServiceImpl<EmsCalpointValu
 		HashMap<String, Object> id = new HashMap<String, Object>();
 		id.put("clock", model.getClock());
 		id.put("itemid", model.getItemid());
-		// 
-		if(emsCalpointValueMapper.selectByPrimaryKey(id)!=null){
-			emsCalpointValueMapper.updateByPrimaryKeySelective(model);
-		}else{
-			emsCalpointValueMapper.insert(model);
+		//
+		TRmCalpoint c = tRmCalpointMapper.selectByPrimaryKey(model.getItemid());
+		if (!c.getItemtype().equals("AUTO")){
+			if(emsCalpointValueMapper.selectByPrimaryKey(id)!=null){
+				emsCalpointValueMapper.updateByPrimaryKeySelective(model);
+			}else{
+				emsCalpointValueMapper.insert(model);
+			}
 		}
 		// 自动新增第二天的数据、或者下月数据
-		TRmCalpoint c = tRmCalpointMapper.selectByPrimaryKey(model.getItemid());
 		Calendar cal = Calendar.getInstance();
 		try {
 			if(c.getMintimegranid().equalsIgnoreCase("DAY")){
@@ -83,21 +85,22 @@ public class EmsCalpointValueServiceImpl extends BaseServiceImpl<EmsCalpointValu
 			return;
 		}
 		EmsCalpointValue nx = emsCalpointValueMapper.selectByPrimaryKey(id);
-		if(nx==null){
-			nx = new EmsCalpointValue();
-			nx.setClock(id.get("clock").toString());
-			nx.setItemid(model.getItemid());
-			nx.setOperDate(new Date());
-			nx.setOperUser(JwtUtil.getUseridByToken());
-			nx.setMintvalue(model.getMendvalue());
-			emsCalpointValueMapper.insert(nx);
-		}else{
-			nx.setOperDate(new Date());
-			nx.setOperUser(JwtUtil.getUseridByToken());
-			nx.setMintvalue(model.getMendvalue());
-			emsCalpointValueMapper.updateByPrimaryKeySelective(nx);
+		if (!c.getItemtype().equals("AUTO")){
+			if(nx==null){
+				nx = new EmsCalpointValue();
+				nx.setClock(id.get("clock").toString());
+				nx.setItemid(model.getItemid());
+				nx.setOperDate(new Date());
+				nx.setOperUser(JwtUtil.getUseridByToken());
+				nx.setMintvalue(model.getMendvalue());
+				emsCalpointValueMapper.insert(nx);
+			}else{
+				nx.setOperDate(new Date());
+				nx.setOperUser(JwtUtil.getUseridByToken());
+				nx.setMintvalue(model.getMendvalue());
+				emsCalpointValueMapper.updateByPrimaryKeySelective(nx);
+			}
 		}
-		
 		//if(c == null || c.getEnergytypeid().equalsIgnoreCase("W")) {
 		if(c == null) {
 			return;
@@ -115,6 +118,8 @@ public class EmsCalpointValueServiceImpl extends BaseServiceImpl<EmsCalpointValu
 			}else{
 				t.setBz("人工录入，自动修改");
 			}
+			t.setMendvalue(model.getMendvalue());//
+			t.setMintvalue(model.getMintvalue());//
 			t.setUpman(JwtUtil.getUseridByToken());
 			t.setUptime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
 			tRmCalpointValueMapper.updateByPrimaryKeySelective(t);
@@ -125,6 +130,8 @@ public class EmsCalpointValueServiceImpl extends BaseServiceImpl<EmsCalpointValu
 			t = new TRmCalpointValue();
 			t.setApportvalue(model.getApportvalue()); // 最终值
 			t.setActualvalue(model.getApportvalue()); // 计算值
+			t.setMendvalue(model.getMendvalue());//
+			t.setMintvalue(model.getMintvalue());//
 			t.setCorrectvalue(BigDecimal.ZERO); // 修正值
 			t.setClock(model.getClock());
 			t.setTimegranid(c.getMintimegranid());

src/main/java/com/steerinfo/ems/emslog/service/impl/EmsLogServiceImpl.java

@@ -40,7 +40,7 @@ public class EmsLogServiceImpl extends BaseServiceImpl<EmsLog, String> implement
 
     public void insertlog(String code,String page,String table,String type){
         String userId = JwtUtil.getUseridByToken();
-        EmsLog emsLog =  new EmsLog();
+        EmsLog emsLog = new EmsLog();
         emsLog.setCode(code);
         emsLog.setOperator(userId);
         emsLog.setPage(page);

src/main/java/com/steerinfo/ems/emsprodplanround/controller/EmsProdplanRoundController.java

@@ -53,7 +53,8 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/${api.version}/emsprodplanrounds")
 public class EmsProdplanRoundController extends BaseRESTfulController {
-
+  public static String page = "轮次计划页面";
+  public static  String table = "EMS_PRODPLAN_ROUND";
     @Autowired
     IEmsProdplanRoundService emsProdplanRoundService;
     @Autowired
@@ -180,9 +181,11 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
             if(model.getState().equals("1") || model.getState().equals("2")){
                 return failed(null,"存在已经下发或者审核的计划,无法做修改");
             }
+            EmsProdplanRound emsProdplanRound = emsProdplanRoundMapper.selectByPrimaryKey(model.getId());
             model.setUpdateman(userId);
             model.setUpdatetime(new Date());
             emsProdplanRoundMapper.updateByPrimaryKey(model);
+            emsLogService.insertlog(emsProdplanRoundService.tostr(emsProdplanRound,model),page,table,BusinessType.UPDATE.toString());
          }
         return  success();
     }
@@ -202,7 +205,7 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
             model.setUpdateman(userId);
             model.setUpdatetime(new Date());
             emsProdplanRoundMapper.updateByPrimaryKey(model);
-            emsLogService.insertlog(emsProdplanRoundService.tostr(emsProdplanRound,model),"轮次计划页面","EMS_PRODPLAN_ROUND",BusinessType.UPDATE.toString());
+            emsLogService.insertlog(emsProdplanRoundService.tostr(emsProdplanRound,model),page,table,BusinessType.UPDATE.toString());
         }
            return  success();
     }
@@ -288,8 +291,10 @@ public class EmsProdplanRoundController extends BaseRESTfulController {
             if (model.getState().equals("1") || model.getState().equals("2")) {
                 return failed(null, "数据已下发或者被接收，无法删除");
             }
-             emsProdplanRoundMapper.deleteByPrimaryKey(model.getId());
+            EmsProdplanRound emsProdplanRound = emsProdplanRoundMapper.selectByPrimaryKey(model.getId());
+            emsProdplanRoundMapper.deleteByPrimaryKey(model.getId());
              updateNbjh(model);
+             emsLogService.insertlog(emsProdplanRoundService.tostr(emsProdplanRound,null),page,table,BusinessType.DELETE.toString());
         }
         return  success();
     }

src/main/java/com/steerinfo/ems/emsprodplanround/service/impl/EmsProdplanRoundServiceImpl.java

@@ -133,20 +133,22 @@ public String tostr(EmsProdplanRound model,EmsProdplanRound model2) {
     sb.append(", 运输方式=").append(model.getTransportType());
     sb.append(", 用途=").append(model.getPurpose());
     sb.append("]");
-    sb.append(",操作后的数据为:[");
-    sb.append(" 轮次编号=").append(model2.getId());
-    sb.append(", 排产时间=").append(DateUtils.dateStr(model2.getMay(),"yyyy-MM-dd"));
-    sb.append(", 描述=").append(model2.getDescribe());
-    sb.append(", 钢种=").append(model2.getGrades());
-    sb.append(", 重量=").append(model2.getPlanWeight());
-    sb.append(", 规格=").append(model2.getSpecifications());
-    sb.append(", 长度=").append(model2.getLengths());
-    sb.append(", 化学成分执行标准=").append(model2.getChemicalStandard());
-    sb.append(", 表面成分执行标准=").append(model2.getSurfaceStandard());
-    sb.append(", 备注=").append(model2.getMemo());
-    sb.append(", 运输方式=").append(model2.getTransportType());
-    sb.append(", 用途=").append(model2.getPurpose());
-    sb.append("]");
+    if(model2 != null){
+        sb.append(",操作后的数据为:[");
+        sb.append(" 轮次编号=").append(model2.getId());
+        sb.append(", 排产时间=").append(DateUtils.dateStr(model2.getMay(),"yyyy-MM-dd"));
+        sb.append(", 描述=").append(model2.getDescribe());
+        sb.append(", 钢种=").append(model2.getGrades());
+        sb.append(", 重量=").append(model2.getPlanWeight());
+        sb.append(", 规格=").append(model2.getSpecifications());
+        sb.append(", 长度=").append(model2.getLengths());
+        sb.append(", 化学成分执行标准=").append(model2.getChemicalStandard());
+        sb.append(", 表面成分执行标准=").append(model2.getSurfaceStandard());
+        sb.append(", 备注=").append(model2.getMemo());
+        sb.append(", 运输方式=").append(model2.getTransportType());
+        sb.append(", 用途=").append(model2.getPurpose());
+        sb.append("]");
+    }
     return sb.toString();
 }
 }

src/main/java/com/steerinfo/ems/trmcalpoint/controller/TRmCalpointController.java

@@ -27,10 +27,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * TRmCalpoint RESTful接口：
@@ -604,4 +601,33 @@ public class TRmCalpointController extends BaseRESTfulController {
         String ret = tRmCalpointService.restatHourDateE(clock, clocke);
         return success(ret);
     }
+
+    @ApiOperation(value="批量更新详细信息", notes="根据传过来的tRmWorkproc数组信息来更新详细信息")
+    @ApiImplicitParam(name = "tRmCalpoint", value = "详细实体tRmCalpoint", required = true, dataType = "TRmCalpoint")
+    //@RequiresPermissions("trmworkproc:update")
+    @PutMapping(value = "/", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult batchupdate(@RequestBody TRmCalpoint[] model){
+        int failnum = 0;
+        String failmsg = "";
+        List<String> errorid = new ArrayList<>();
+        for(int i = 0;i < model.length;i++){
+            try {
+                LOGGER.info("计量点维护修改的第" + (i + 1) + "条数据:");
+                LOGGER.info("计量点维护修改前数据是" + tRmCalpointService.getById(model[i].getId()).toString());
+                model[i].setUpdateman(JwtUtil.getUseridByToken());
+                TRmCalpoint tRmCalpoint = tRmCalpointService.modify(model[i]);
+                LOGGER.info("计量点维护修改后数据是" + tRmCalpoint.toString());
+            }
+            catch(Exception e){
+                failnum++;
+                errorid.add(model[i].getId());
+                failmsg += "计量带你维护修改在第" + (i + 1) + "条数据出现错误,错误原因是" + e + ",id是" + model[i].getId();
+            }
+        }
+        if(failnum > 0){
+            LOGGER.info("本次共修改" + model.length + "条数据,其中成功" + (model.length - failnum) + "条,失败" + failnum + "条,失败原因:" + failmsg);
+            return success(errorid,"51","本次共修改" + model.length + "条数据,其中成功" + (model.length - failnum) + "条,失败" + failnum + "条");
+        }
+        return success();
+    }
 }

src/main/java/com/steerinfo/ems/trmcalpoint/mapper/TRmCalpointMapper.xml

@@ -1054,6 +1054,7 @@
         and TRANSFER = #{transfer}
       </if>
     </where>
+    order by ENERGYTYPEID,ENERGYID,COSTID,PROPERTYID
   </select>
   <insert id="batchInsert" parameterType="java.util.List">
     insert into T_RM_CALPOINT

src/main/java/com/steerinfo/ems/usagedata/service/impl/UsageDataServiceImpl.java

@@ -1,5 +1,7 @@
 package com.steerinfo.ems.usagedata.service.impl;
 
+import com.steerinfo.framework.datasource.DataSourceKey;
+import com.steerinfo.framework.datasource.TargetDataSource;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -82,6 +84,7 @@ public class UsageDataServiceImpl extends BaseServiceImpl<UsageData, String> imp
 	 * 统计自动上传的能源上报数据
 	 * @return
 	 */
+    @TargetDataSource(dataSourceKey = DataSourceKey.DB_OTHER)
     public String getAutoSum(String clock) {
     	if(clock==null || clock.isEmpty()){
     		return "请传入统计日期";