src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -115,10 +115,7 @@ */ @PostMapping("/submit") public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit) throws Exception { if (dispatcherUnit.getId()==null){ arg.test01(arg.url+"/dispatcherUnit/save",dispatcherUnit); } if (null==dispatcherUnit.getId()){ if (null==dispatcherUnit.getId()) { dispatcherUnit.setCreateTime(new Date()); } return R.status(dispatcherUnitService.saveOrUpdate(dispatcherUnit)); src/main/java/org/springblade/modules/information/controller/InformationController.java
@@ -38,12 +38,14 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.lang.reflect.Field; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE; /** * 控制器 @@ -59,7 +61,6 @@ private final IInformationService informationService; private final IDeptService iDeptService; /** * 详情 @@ -214,6 +215,7 @@ List<Map<Object, Object>> lists = informationService.selectHold(deptid); return R.data(lists); } /** * 派遣服务单位统计 */ @@ -239,19 +241,50 @@ public R selectSoil(String deptid) { List<Map<Object, Object>> lists = informationService.selectSoil(deptid); List<Map<String, Object>> list = new ArrayList<>(); for (int i=0;i<lists.size();i++){ for (int i = 0; i < lists.size(); i++) { Map<String, Object> map = new HashMap<String, Object>(); String numj = lists.get(i).get("numj").toString(); Integer a=Integer.valueOf(numj); Integer a = Integer.valueOf(numj); String numz = lists.get(i).get("numz").toString(); Integer b=Integer.valueOf(numz); Integer c=b-a; map.put("numj",a); map.put("nmuwj",c); Integer b = Integer.valueOf(numz); Integer c = b - a; map.put("numj", a); map.put("nmuwj", c); list.add(map); } return R.data(list); } public static String getJSONStringFromJavaBean(Class<? extends Object> clazz) { Field[] fields = clazz.getDeclaredFields(); StringBuffer stb = new StringBuffer("{"); for (int i = 0; i < fields.length; i++) { try { Field field = fields[i]; field.setAccessible(true); String name = field.getName(); stb.append("\"").append(name).append("\"").append(":\"\"").append(","); } catch (Exception e) { e.printStackTrace(); } } int i = stb.lastIndexOf(","); return stb.substring(0, i) + "}"; } } src/main/java/org/springblade/modules/information/mapper/InformationMapper.xml
@@ -41,6 +41,9 @@ <if test="information.jurisdiction!=null and information.jurisdiction!=''"> and jurisdiction=#{jurisdiction} </if> <if test="information.departmentid!=null and information.departmentid!=''"> and departmentid=#{departmentid} </if> </select> <delete id="deleteIn"> src/main/java/org/springblade/modules/seinspect/mapper/SeinspectMapper.xml
@@ -18,7 +18,7 @@ <select id="selectSeinspectPage" resultMap="seinspectResultMap"> select * from sys_seinspect where is_deleted = 0 select * from sys_seinspect </select> </mapper> src/main/java/org/springblade/modules/system/controller/RoleController.java
@@ -56,7 +56,7 @@ @AllArgsConstructor @RequestMapping(AppConstant.APPLICATION_SYSTEM_NAME + "/role") @Api(value = "角色", tags = "角色") @PreAuth(RoleConstant.HAS_ROLE_ADMIN) //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public class RoleController extends BladeController { private final IRoleService roleService; src/main/java/org/springblade/modules/system/controller/TenantController.java
@@ -85,7 +85,7 @@ }) @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入tenant") @PreAuth(RoleConstant.HAS_ROLE_ADMIN) //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R<IPage<Tenant>> list(@ApiIgnore @RequestParam Map<String, Object> tenant, Query query, BladeUser bladeUser) { QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant, Tenant.class); IPage<Tenant> pages = tenantService.page(Condition.getPage(query), (!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper); @@ -98,7 +98,7 @@ @GetMapping("/select") @ApiOperationSupport(order = 3) @ApiOperation(value = "下拉数据源", notes = "传入tenant") @PreAuth(RoleConstant.HAS_ROLE_ADMIN) //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R<List<Tenant>> select(Tenant tenant, BladeUser bladeUser) { QueryWrapper<Tenant> queryWrapper = Condition.getQueryWrapper(tenant); List<Tenant> list = tenantService.list((!bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID)) ? queryWrapper.lambda().eq(Tenant::getTenantId, bladeUser.getTenantId()) : queryWrapper); @@ -111,7 +111,7 @@ @GetMapping("/page") @ApiOperationSupport(order = 4) @ApiOperation(value = "分页", notes = "传入tenant") @PreAuth(RoleConstant.HAS_ROLE_ADMIN) //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R<IPage<Tenant>> page(Tenant tenant, Query query) { IPage<Tenant> pages = tenantService.selectTenantPage(Condition.getPage(query), tenant); return R.data(pages); @@ -123,7 +123,7 @@ @PostMapping("/submit") @ApiOperationSupport(order = 5) @ApiOperation(value = "新增或修改", notes = "传入tenant") @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) public R submit(@Valid @RequestBody Tenant tenant) { return R.status(tenantService.submitTenant(tenant)); } @@ -135,7 +135,7 @@ @PostMapping("/remove") @ApiOperationSupport(order = 6) @ApiOperation(value = "逻辑删除", notes = "传入ids") @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { return R.status(tenantService.removeTenant(Func.toLongList(ids))); } @@ -146,7 +146,7 @@ @PostMapping("/setting") @ApiOperationSupport(order = 7) @ApiOperation(value = "授权配置", notes = "传入ids,accountNumber,expireTime") @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) public R setting(@ApiParam(value = "主键集合", required = true) @RequestParam String ids, @ApiParam(value = "账号额度") Integer accountNumber, @ApiParam(value = "过期时间") Date expireTime) { return R.status(tenantService.setting(accountNumber, expireTime, ids)); } @@ -156,7 +156,7 @@ */ @PostMapping("datasource") @ApiOperationSupport(order = 8) @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) //@PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) @ApiOperation(value = "数据源配置", notes = "传入datasource_id") public R datasource(@ApiParam(value = "租户ID", required = true) @RequestParam String tenantId, @ApiParam(value = "数据源ID", required = true) @RequestParam Long datasourceId){ CacheUtil.evict(TENANT_DATASOURCE_CACHE, TENANT_DATASOURCE_EXIST_KEY, tenantId, Boolean.FALSE); @@ -171,7 +171,7 @@ @GetMapping("/find-by-name") @ApiOperationSupport(order = 9) @ApiOperation(value = "详情", notes = "传入tenant") @PreAuth(RoleConstant.HAS_ROLE_ADMIN) //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R<List<Tenant>> findByName(String name) { List<Tenant> list = tenantService.list(Wrappers.<Tenant>query().lambda().like(Tenant::getTenantName, name)); return R.data(list); src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -137,8 +137,6 @@ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN) public R submit(@Valid @RequestBody User user) throws Exception { CacheUtil.clear(USER_CACHE); arg arg = new arg(); arg.test01(arg.url+"/blade-user/save",user); return R.status(userService.submit(user)); }
