合同

src/main/java/common/controller/ContractController.java

@@ -29,6 +29,12 @@ public class ContractController {
         return ResultModel.OK(service.findAll(startDate, endDate));
     }
 
+    @RequestMapping(value = "findone", method = RequestMethod.GET)
+    @ResponseBody
+    public ResultModel findOne(@CurrentAccount User loginAccount, @RequestParam String code) {
+        return ResultModel.OK(service.findOne(code));
+    }
+
     @RequestMapping(value = "checkAccount", method = RequestMethod.GET)
     @ResponseBody
     public ResultModel checkAccount(@CurrentAccount User loginAccount, @RequestParam String email) {

src/main/java/common/service/ContractService.java

@@ -29,6 +29,8 @@ public interface ContractService {
 
     List<Contract> findAll(String startDate, String endDate);
 
+    Contract findOne(String code);
+
     ContractMoney pay(User loginUser, ContractMoney resource);
 
     Contract change(User loginUser, ContractChange resource);

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -196,6 +196,32 @@ public class ContractServiceImpl implements ContractService{
     }
 
     @Override
+    public Contract findOne(String code) {
+
+        List<Contract> result = new ArrayList<>();
+        List<User> sales = userRepository.findAll();
+        Map<Long, String> saleMap = new HashMap<>();
+        if(ValidateUtil.isValid(sales)){
+            for(User s: sales){
+                saleMap.put(s.getId(), s.getName());
+            }
+        }
+        List<PackageType> typeList = packageTypeRepository.findAll();
+        Map<Long, String> typeMap = new HashMap<>();
+        if(ValidateUtil.isValid(typeList)){
+            for(PackageType s: typeList){
+                typeMap.put(s.getId(), s.getPackageName());
+            }
+        }
+        Contract contract = contractRepository.findByCode(code);
+        contract.setSaleName(saleMap.containsKey(contract.getSale()) ? saleMap.get(contract.getSale()) : "");
+        contract.setPriceLevelName(typeMap.containsKey(contract.getPriceLevel()) ? typeMap.get(contract.getPriceLevel()) : "");
+        contract.setCreateName(saleMap.containsKey(contract.getSale()) ? saleMap.get(contract.getSale()) : "");
+
+        return contract;
+    }
+
+    @Override
     public ContractMoney pay(User loginUser, ContractMoney resource) {
         Contract contract = contractRepository.findByCode(resource.getContractCode());
         if(resource.getType().equals("pay")){

src/main/java/common/task/SyncAppDataTask.java

@@ -242,7 +242,7 @@ public class SyncAppDataTask
                     opds.setDs(array[2].toString());
                     resultList.add(opds);
                     if (resultList.size() >= 2000) {
-                        System.out.println(resultList);
+                        //System.out.println(resultList);
                         otPkgDevStatsRepository.save(resultList);
                         resultList = new ArrayList<>();
                     }
@@ -250,7 +250,7 @@ public class SyncAppDataTask
                     AppInfo appInfo = generateAppInfo(array, ry_pkgNameList, map, newCategorys, citys);
                     appResultList.add(appInfo);
                     if (appResultList.size() >= 2000) {
-                        System.out.println(appResultList);
+                        //System.out.println(appResultList);
                         appInfoRepository.save(appResultList);
                         appResultList = new ArrayList<>();
                     }
@@ -263,7 +263,7 @@ public class SyncAppDataTask
                 appInfoRepository.save(appResultList);
             }
 
-            System.out.println(newCategorys);
+            //System.out.println(newCategorys);
             if (newCategorys.size() > 0) {
                 appCategoryRepository.save(newCategorys);
             }