Merge branch 'develop_tzs_register' of…

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/CommonController.java

@@ -539,5 +539,11 @@ public class CommonController extends BaseController {
         return ResponseHelper.buildResponse("succese");
     }
 
-
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PutMapping(value = "/unitType/selected")
+    @ApiOperation(httpMethod = "PUT", value = "更新缓存中单位类型", notes = "更新缓存中单位类型")
+    public ResponseModel<String> updateUnitTypeCache(@ApiParam("单位类型") @RequestParam String unitType){
+        commonService.updateUnitTypeCache(getSelectedOrgInfo(), unitType);
+        return ResponseHelper.buildResponse("success");
+    }
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/ICommonService.java

@@ -187,4 +187,11 @@ public interface ICommonService {
     CompanyBo getOneCompany(String companyCode);
 
     Integer checkFactoryNumUniquenessForVehicleCylinder(String factoryNum,String sequenceNbr);
+
+    /**
+     * 更新单位类型缓存
+     *
+     * @param unitType 单位类型
+     */
+    void updateUnitTypeCache(ReginParams reginParams, String unitType);
 }

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -159,6 +159,10 @@ public class CommonServiceImpl implements ICommonService {
     private static final String SBZX_PAGE_ID = "jgScrapCancelAdd";
     // 业务通用发起——更名变更表单key
     private static final String GMBG_PAGE_ID = "jgRegistrationInfo";
+
+    @Value("${redis.cache.failure.time}")
+    private Long redisRegionTimeSecond;
+
     @Autowired
     EquipmentCategoryMapper equipmentCategoryMapper;
     @Autowired
@@ -1800,4 +1804,10 @@ public class CommonServiceImpl implements ICommonService {
                 return "templates/use-flag-model-other.pdf";
         }
     }
+
+    @Override
+    public void updateUnitTypeCache(ReginParams reginParams, String unitType) {
+        reginParams.getCompany().setCompanyType(unitType);
+        redisUtils.set(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken()), JSONObject.toJSONString(reginParams), redisRegionTimeSecond);
+    }
 }
\ No newline at end of file