更新

src/main/java/com/template/common/utils/AES.java

@@ -172,7 +172,7 @@ public class AES {
 		String s="qedS5LjKuPlHHLTiy657GYAAPWslki6rv8AbgN6hqDZLM2Rbgd5XilvOUivIRCHxQJeQeKd2ydDj621GcO6HNVIz3wBtIrUwhe0TJm7kfIfuRQXuo2QVZtX7/S6KowSU";
 //		String s="UtoBNp9fICucUkBimiClN3z5Tz7o0KLiwJ9z50zjOiWNcnqYZ/p/awyi01nDEmxOShfMZFTd9uWkWM7fNPHotvsGhxAdHZNiv3WOMYWzuHIDu27iNcH9tkZhEIr72EFo";
 //		解密
-		String decrypt = decryptFromBase64("MQdw2zW/srXr5Lm/vntgQ8rlW6gin+/VKfb9aKi36nyiEtwg1hORSLOTm9y0m8WxpLoECkMeDa0WQevMHmkNGQajYMrDRhGho6jGGvdNdQVRQXNSWGRZgQTg3ycq1cxT", key);
+		String decrypt = decryptFromBase64("MnkyzBqT5LNV97iXYyibPLK52FwJZ90ERMlwxbvWb4VYhl6gfgwgorfsiKomQRG3YUhTF5dNbO0Czug9e8eU98TBjGtUQKRKM+RKAKPETbeK3595KIzF+P7ALSXqIBv60+vGvM8BM7rMal2wTH0YAUmCdiDUwXY22DalQWxGMwRw=", key);
 		System.out.println("decrypt = " + decrypt);
 
 

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -1512,7 +1512,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)//1
+//    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult checkOut(CheckOutDto checkOutDto) {
         int adminId = checkOutDto.getAdminId();
         PermissionSetting permissionSetting = permissionSettingService.getById(adminId);

src/main/java/com/template/controller/HouseOrderController.java

@@ -3880,20 +3880,6 @@ public class HouseOrderController implements HouseOrderAPI {
 
     @Override
     public CommonResult tianditu(String ds, String tk) {
-//        String url="http://api.tianditu.gov.cn/geocoder?ds="+ds+"&tk="+tk;
-
-//        JSONObject map = new JSONObject();
-//        map.put("keyWord",ds);
-//
-//        String url="http://api.tianditu.gov.cn/geocoder?ds="+map.toString()+"&tk=" + tk;;
-//        System.out.println("url = " + url);
-//        RestTemplate restTemplate = new RestTemplate();
-//        ResponseEntity<String> forEntity = restTemplate.getForEntity(url, String.class);
-//        String body = forEntity.getBody();
-//        JSONObject jsonObject = JSONObject.parseObject(body);
-//        System.out.println("jsonObject = " + jsonObject);
-//        return CommonResult.ok(jsonObject);
-
         String url = "http://api.tianditu.gov.cn/geocoder";
         Map<String, String> param = new HashMap<>();
         JSONObject jsonObject2 = new JSONObject();
@@ -3902,7 +3888,6 @@ public class HouseOrderController implements HouseOrderAPI {
         param.put("tk", tk);
         String s = HttpClientUtil.doGet(url, param);
         JSONObject jsonObject = JSONObject.parseObject(s);
-        System.out.println("jsonObject = " + jsonObject);
         String status = jsonObject.getString("status");
         if ("0".equals(status)) {
             return CommonResult.ok(jsonObject);
@@ -3910,7 +3895,6 @@ public class HouseOrderController implements HouseOrderAPI {
         return CommonResult.fail();
     }
 
-
     public static void main(String[] args) throws Exception {
 //        获取签名
         //        随机字符串

src/main/java/com/template/controller/TotalCardController.java

@@ -20,6 +20,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * <p>
@@ -155,7 +156,7 @@ public class TotalCardController implements TotalCardControllerAPI {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)//1
+//    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult deleteTotalCard(Integer id) {
         TotalCard totalCard = totalCardService.getById(id);
 
@@ -196,8 +197,9 @@ public class TotalCardController implements TotalCardControllerAPI {
         List<UnlockingEmployee> list = unlockingEmployeeService.list(wrapperUe);
 
 
-        ArrayList<Integer> idUEs = new ArrayList<>();
+//        ArrayList<Integer> idUEs = new ArrayList<>();
         for (UnlockingEmployee unlockingEmployee : list) {
+            System.out.println("删除用户id："+unlockingEmployee.getId());
             String luid = unlockingEmployee.getLuid();
             String lockUserId = unlockingEmployee.getLockUserId();
             passwordIssController.deleteLockUser(luid, lockUserId);