[用户] [清退] [专管员统计] 代码提交

dev-blockcha/src/main/java/com/tykj/dev/blockcha/subject/service/impl/BlockChainUtilImpl.java

@@ -27,17 +27,17 @@ import java.util.UUID;
 @Component
 public class BlockChainUtilImpl implements BlockChainUtil {
 
-    private  String SECRET_KEY = "3mdeM1dw2FfHrd5h6WAuhB3WYdDG6ZAgz96CcM1nzxbiYA8QaaZHW75Je9xKixTTD2rwujyb1gVUNPYm5W6FPZQ8";
-    private  String SECRET_ID = "3yXRRiL9xsLfbt2kv7qRH2so6ChJX3rFkay7Njcsxfbp";
+//    private  String SECRET_KEY = "3mdeM1dw2FfHrd5h6WAuhB3WYdDG6ZAgz96CcM1nzxbiYA8QaaZHW75Je9xKixTTD2rwujyb1gVUNPYm5W6FPZQ8";
+//    private  String SECRET_ID = "3yXRRiL9xsLfbt2kv7qRH2so6ChJX3rFkay7Njcsxfbp";
     //测试环境
 
 //    public  String SECRET_KEY;
 //    public  String SECRET_ID;
     //测试环境
-//    public String SECRET_KEY = "3RJWStDCXN7mqJyZAB8rF59f87arGShdk9aKyDN3wKbzq9JnaXom1Hpe6mHT1k2yx9zfE7VFWidqwuxyT7DtPjCs";
-//    public String SECRET_ID = "JAjQyTZdR8bmbHaU6iiFGvrCuUik4cG4U4ostk8KKrbS";
+    public String SECRET_KEY = "3RJWStDCXN7mqJyZAB8rF59f87arGShdk9aKyDN3wKbzq9JnaXom1Hpe6mHT1k2yx9zfE7VFWidqwuxyT7DtPjCs";
+    public String SECRET_ID = "JAjQyTZdR8bmbHaU6iiFGvrCuUik4cG4U4ostk8KKrbS";
 
-    private final static String BLOCK_CHAIN_URL = "http://10.153.4.12:8076";
+    private final static String BLOCK_CHAIN_URL = "http://192.168.0.80:8076";
     private final static String BLOCK_CHAIN_URL2 = "http://10.153.8.10:8076";
     private final static String BLOCK_CHAIN_URL3 = "http://10.153.8.11:8076";
     private final static String BLOCK_CHAIN_URL4 = "http://10.153.110.10:8076";
@@ -341,6 +341,7 @@ public class BlockChainUtilImpl implements BlockChainUtil {
         request.put("recordID", recordId);
         String s = ApiSignatureUtil.getApiSignature(request, SECRET_KEY);
         request.put("apiSignature", s);
+
         return new RestTemplate().postForObject(
                 BLOCK_CHAIN_URL + BcUrl.APPEND_HASH,
                 request,

dev-sendback/src/main/java/com/tykj/dev/device/sendback/service/impl/SendBackServiceImpl.java

@@ -1674,26 +1674,20 @@ public class SendBackServiceImpl implements SendBackService {
 
     private SendBackBill saveSendBackBill(SendBackBill sendBackBill){
         SendBackBill sendBackBill1 = sendBackBillEntityDao.save(sendBackBill);
-        if (sendBackBill1.getRecordId()==null || sendBackBill1.getRecordId().equals("")){
             BcHash bcHash=blockChainUtil.sendHash(1000,JacksonUtil.toJSon(sendBackBill1));
             sendBackBill1.setRecordId(bcHash.getData().getRecordID());
-            return sendBackBillEntityDao.save(sendBackBill1);
-        }else {
-            blockChainUtil.appendHash(JacksonUtil.toJSon(sendBackBill1),sendBackBill1.getRecordId());
+            sendBackBillEntityDao.save(sendBackBill1);
         return sendBackBill1;
-        }
+
     }
 
     private SendBackBillDetail saveSendBackBillDetail(SendBackBillDetail sendBackBillDetail){
         SendBackBillDetail sendBackBillDetail1 = sendBackBillDetailEntityDao.save(sendBackBillDetail);
-        if (sendBackBillDetail1.getRecordId()==null || sendBackBillDetail1.getRecordId().equals("")){
             BcHash bcHash=blockChainUtil.sendHash(1000,JacksonUtil.toJSon(sendBackBillDetail1));
             sendBackBillDetail1.setRecordId(bcHash.getData().getRecordID());
-            return sendBackBillDetailEntityDao.save(sendBackBillDetail1);
-        }else {
-            blockChainUtil.appendHash(JacksonUtil.toJSon(sendBackBillDetail1),sendBackBillDetail1.getRecordId());
+            sendBackBillDetailEntityDao.save(sendBackBillDetail1);
             return sendBackBillDetail1;
-        }
+
     }
 
 }

dev-train/src/main/java/com/tykj/dev/device/train/controller/TrainJobController.java

@@ -457,14 +457,10 @@ public class TrainJobController {
 
     private TrainUser saveTrainUser(TrainUser trainUser){
         TrainUser trainUser1 = trainUserDao.save(trainUser);
-        if (trainUser1.getRecordId()==null || trainUser1.getRecordId().equals("")){
             BcHash bcHash=blockChainUtil.sendHash(1000,JacksonUtil.toJSon(trainUser1));
             trainUser1.setRecordId(bcHash.getData().getRecordID());
-            return trainUserDao.save(trainUser1);
-        }else {
-            blockChainUtil.appendHash(JacksonUtil.toJSon(trainUser1),trainUser1.getRecordId());
+            trainUserDao.save(trainUser1);
             return trainUser1;
-        }
     }
 
 }

dev-train/src/main/java/com/tykj/dev/device/train/service/impl/TrainThemeServiceImpl.java

@@ -66,14 +66,11 @@ public class TrainThemeServiceImpl implements TrainThemeService {
     @Override
     public TrainTheme save(TrainTheme trainTheme) {
         TrainTheme trainTheme1 = trainThemeDao.save(trainTheme);
-        if (trainTheme1.getRecordId()==null || trainTheme1.getRecordId().equals("")){
             BcHash bcHash=blockChainUtil.sendHash(1000,JacksonUtil.toJSon(trainTheme1));
             trainTheme1.setRecordId(bcHash.getData().getRecordID());
-            return trainThemeDao.save(trainTheme1);
-        }else {
-            blockChainUtil.appendHash(JacksonUtil.toJSon(trainTheme1),trainTheme1.getRecordId());
+            trainThemeDao.save(trainTheme1);
             return trainTheme1;
-        }
+
     }
 
     @Override