diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppUploadController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppUploadController.java deleted file mode 100644 index c74b3a59..00000000 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppUploadController.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.zdxt.app.controller; - -import com.zdxt.app.domain.AppUpload; -import com.zdxt.app.service.AppUploadService; -import com.zdxt.auth.framework.web.domain.AjaxResult; -import com.zdxt.common.ZDResponse; -import com.zdxt.common.controller.BaseController; -import com.zdxt.common.util.TableDataInfo; -import com.zdxt.log.aspectj.lang.annotation.Log; -import com.zdxt.log.aspectj.lang.enums.BusinessType; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import java.io.*; -import java.util.List; - -/** - * @Author hangjialin - * @Date 2019/12/23 15:08 - * @Version 1.0 - */ -@Controller -@RequestMapping("/project/appUpload") -public class AppUploadController extends BaseController { - private String prefix = "project/appUpload"; - - @Autowired - private AppUploadService appUploadService; - - @RequiresPermissions("project:appUpload:view") - @GetMapping("/view") - public String user() - { - return prefix + "/appUpload"; - } - - @RequiresPermissions("project:appUpload:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(AppUpload appUpload) - { - startPage(); - List list = appUploadService.getAppUploadList(appUpload); - return getDataTable(list); - } - - /** - * 新增 - */ - @GetMapping("/add") - public String add(ModelMap mmap) - { - return prefix + "/add"; - } - /** - * 新增APP上传 - */ - @RequiresPermissions("project:appUpload:add") - @Log(title = "新增APP上传", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(@Validated AppUpload appUpload, @RequestParam("file")MultipartFile file) throws IOException { - return AjaxResult.success("操作成功", appUploadService.insertAppUpload(appUpload,file)); - } - - /** - * 修改APP上传 - */ - @GetMapping("/edit/{appId}") - public String edit(@PathVariable("appId") String appId, ModelMap mmap) - { - mmap.put("app", appUploadService.selectByAppId(appId)); - return prefix + "/edit"; - } - - /** - * 修改APP上传 - */ - @RequiresPermissions("project:appUpload:edit") - @Log(title = " 修改APP上传", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(@Validated AppUpload appUpload, @RequestParam("file")MultipartFile file) throws IOException { - return AjaxResult.success("操作成功",appUploadService.updateAppUpload(appUpload,file)); - } - - /** - * 修改状态 - */ - @Log(title = "修改状态", businessType = BusinessType.UPDATE) - @RequiresPermissions("project:appUpload:edit") - @PostMapping("/editStatus") - @ResponseBody - public AjaxResult editStatus(String appStatus,String appId) - { - return AjaxResult.success("操作成功",appUploadService.updateAppUploadState(appStatus,appId)); - } - - /** - * 删除APP上传 - *//* - @RequiresPermissions("project:appUpload:remove") - @Log(title = "删除APP上传", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return AjaxResult("操作成功",appUploadService.deleteAppUploads(ids)); - }*/ - /** - * 删除APP上传 - */ - @RequiresPermissions("project:appUpload:remove") - @Log(title = "删除APP上传", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove(String ids) - { - return AjaxResult.success(appUploadService.deleteAppUploads(ids)); - } - /** - * 查询APP转态为有效的数据 - * @return - */ - @GetMapping( "/getValidStatus") - @ResponseBody - public TableDataInfo getValidStatus() { - List list= this.appUploadService.getValidStatus("0"); - return getDataTable(list); - } -} diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/domain/AppUpload.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/domain/AppUpload.java deleted file mode 100644 index 2a4571bf..00000000 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/domain/AppUpload.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.zdxt.app.domain; - -import java.util.Date; - -/** - * @Author hangjialin - * @Date 2019/12/23 11:15 - * @Version 1.0 - * APP上传 - */ -public class AppUpload { - - private static final long serialVersionUID = -1769115449597745872L; - - /** APP上传ID */ - private String appId; - - /** APP上传版本号 */ - private String appVersion; - - /** APP上传描述 */ - private String appDescribe; - - /** APP上传状态（0有效 1无效） */ - private String appStatus; - - /** APP上传时间 */ - private Date uploadTime;//APP上传时间 - - /** APP上传人 */ - private String uploadBy; - - /** APP上传路径 */ - private String uploadPath; - - public static long getSerialVersionUID() { return serialVersionUID; } - - public String getAppId() { return appId; } - - public void setAppId(String appId) { this.appId = appId; } - - public String getAppVersion() { return appVersion; } - - public void setAppVersion(String appVersion) { this.appVersion = appVersion; } - - public String getAppDescribe() { return appDescribe; } - - public void setAppDescribe(String appDescribe) { this.appDescribe = appDescribe; } - - public String getAppStatus() { return appStatus; } - - public void setAppStatus(String appStatus) { this.appStatus = appStatus; } - - public Date getUploadTime() { return uploadTime; } - - public void setUploadTime(Date uploadTime) { this.uploadTime = uploadTime; } - - public String getUploadBy() { return uploadBy; } - - public void setUploadBy(String uploadBy) { this.uploadBy = uploadBy; } - - public String getUploadPath() { return uploadPath; } - - public void setUploadPath(String uploadPath) { this.uploadPath = uploadPath; } - - @Override - public String toString() { - return "AppUpload{" + - "appId=" + appId + - ", appVersion='" + appVersion + '\'' + - ", appDescribe='" + appDescribe + '\'' + - ", appStatus='" + appStatus + '\'' + - ", uploadTime=" + uploadTime + - ", uploadBy='" + uploadBy + '\'' + - ", uploadPath='" + uploadPath + '\'' + - '}'; - } -} diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/mapper/AppUploadMapper.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/mapper/AppUploadMapper.java deleted file mode 100644 index 310bb346..00000000 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/mapper/AppUploadMapper.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.zdxt.app.mapper; - -import com.zdxt.app.domain.AppUpload; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @Author hangjialin - * @Date 2019/12/23 11:58 - * @Version 1.0 - * APP上传 - */ -public interface AppUploadMapper { - /** - * 查询APP上传列表 - * @param appUpload - * @return - */ - public List getAppUploadList(AppUpload appUpload); - - /** - * 根据id查询查询列表 - * @return - */ - public AppUpload selectByAppId(String appId); - - /** - * 新增APP上传 - * @param appUpload - * @return - */ - public int insertAppUpload(AppUpload appUpload); - - /** - * 修改APP上传 - * @param appUpload - * @return - */ - public int updateAppUpload(AppUpload appUpload); - - /** - * 修改当前选中的状态开启(0.正常) - * @param appId - * @return - */ - public int updateAppUploadState(@Param("appStatus") String appStatus, @Param("appId") String appId); - - /** - * 列表所有的状态修改为(1.失效) - * @return - */ - public int updateAppUploadStatus(); - - /** - * 删除APP上传 - * @param appId - * @return - */ - public int deleteAppUpload(String appId); - - /** - * 批量删除APP上传 - * @param appId - * @return - */ - public int deleteAppUploads(String[] appId); - - /** - * 查询APP转态为有效的数据 - * @return - */ - public List getValidStatus(String appStatus); -} diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/service/AppUploadService.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/service/AppUploadService.java deleted file mode 100644 index 1d1ea67f..00000000 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/service/AppUploadService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.zdxt.app.service; - -import com.zdxt.app.domain.AppUpload; -import com.zdxt.common.ZDResponse; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.util.List; - -/** - * @Author hangjialin - * @Date 2019/12/23 14:49 - * @Version 1.0 - * APP上传 - */ -public interface AppUploadService { - /** - * 查询APP上传列表 - * @param appUpload - * @return - */ - public List getAppUploadList(AppUpload appUpload); - - /** - * 根据id查询查询列表 - * @return - */ - public AppUpload selectByAppId(String appId); - - /** - * 新增APP上传 - * @param appUpload - * @return - */ - public int insertAppUpload(AppUpload appUpload, MultipartFile file) throws IOException; - - /** - * 修改APP上传 - * @param appUpload - * @return - */ - public int updateAppUpload(AppUpload appUpload, MultipartFile file) throws IOException; - - /** - * 修改当前选中的状态开启(0.正常,1.失效) - * @param appId - * @return - */ - public int updateAppUploadState(String appStatus, String appId); - - /** - * 删除APP上传 - * @param appId - * @return - */ - public int deleteAppUpload(String appId); - - /** - * 批量删除APP上传 - * @param appId - * @return - */ - int deleteAppUploads(String ids); - - /** - * 查询APP转态为有效的数据 - * @return - */ - public List getValidStatus(String appStatus); -} diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/service/impl/AppUploadServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/service/impl/AppUploadServiceImpl.java deleted file mode 100644 index 2069bac1..00000000 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/service/impl/AppUploadServiceImpl.java +++ /dev/null @@ -1,168 +0,0 @@ -package com.zdxt.app.service.impl; - - -import cn.hutool.core.util.StrUtil; -import com.zdxt.app.domain.ApkInfo; -import com.zdxt.app.domain.AppUpload; -import com.zdxt.app.mapper.AppUploadMapper; -import com.zdxt.app.service.AppUploadService; -import com.zdxt.auth.common.utils.file.FileUploadUtils; -import com.zdxt.auth.common.utils.security.ShiroUtils; -import com.zdxt.auth.feign.FileUploadApi; -import com.zdxt.common.ZDResponse; -import com.zdxt.common.util.Convert; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - -import java.io.*; -import java.util.Date; -import java.util.List; -import java.util.UUID; - -/** - * @Author hangjialin - * @Date 2019/12/23 14:51 - * @Version 1.0 - * APP上传文件 - */ -@Service -public class AppUploadServiceImpl implements AppUploadService { - @Autowired - private AppUploadMapper appUploadMapper; - - @Autowired - private FileUploadApi fileUploadApi; - - @Value("${ruoyi.profile}") - private String urlProfile; - - public static final String PACKAGE = "package"; - - private static final String SPLIT_REGEX = "(: )|(=')|(' )|'"; - - /** - * 查询APP上传列表 - * @param appUpload - * @return - */ - @Override - public List getAppUploadList(AppUpload appUpload) { - return this.appUploadMapper.getAppUploadList(appUpload); - } - - /** - * 根据id查询查询列表 - * @return - */ - @Override - public AppUpload selectByAppId(String appId) { - return this.appUploadMapper.selectByAppId(appId); - } - - /** - * 新增APP上传 - * @param appUpload - * @return - */ - @Override - public int insertAppUpload(AppUpload appUpload, MultipartFile file) throws IOException { - getAppUpload(appUpload,file); - Date date = new Date(); - String guid = UUID.randomUUID().toString(); - appUpload.setAppId(guid); - appUpload.setUploadTime(date); - appUpload.setAppStatus("1"); - appUpload.setUploadBy(ShiroUtils.getSysUser().getUserName()); - return this.appUploadMapper.insertAppUpload(appUpload); - } - - /** - * 修改APP上传 - * @param appUpload - * @return - */ - @Override - public int updateAppUpload(AppUpload appUpload, MultipartFile file) throws IOException { - getAppUpload(appUpload,file); - return this.appUploadMapper.updateAppUpload(appUpload); - } - - /** - * 修改当前选中的状态开启(0.正常1.失效) - * @param appId - * @return - */ - @Override - public int updateAppUploadState(String appStatus,String appId) { - this.appUploadMapper.updateAppUploadStatus(); - return this.appUploadMapper.updateAppUploadState(appStatus,appId); - } - - /** - * 删除APP上传 - * @param appId - * @return - */ - @Override - public int deleteAppUpload(String appId) { - return this.appUploadMapper.deleteAppUpload(appId); - } - - @Override - public int deleteAppUploads(String ids) { - return this.appUploadMapper.deleteAppUploads(Convert.toStrArray(ids)); - } - - - /** - * 查询APP转态为有效的数据 - * @return - */ - @Override - public List getValidStatus(String appStatus) { - return this.appUploadMapper.getValidStatus(appStatus); - } - - /** - * 给版本号赋值 - * @param apkInfo - * @param source - */ - private void setApkInfoProperty(ApkInfo apkInfo, String source) { - if (source.startsWith(PACKAGE)) { - String[] packageInfo = source.split(SPLIT_REGEX); - apkInfo.setPackageName(packageInfo[2]); - apkInfo.setVersionCode(packageInfo[4]); - apkInfo.setVersionName(packageInfo[6]); - } - } - - /** - * 上传文件 - */ - public void getAppUpload(AppUpload appUpload, MultipartFile file)throws IOException { - ApkInfo apkInfo = new ApkInfo(); - String aaptTool = urlProfile + "/aapt.exe"; - // 上传文件路径 - String filePath = FileUploadUtils.getDefaultBaseDir(); - // 上传并返回新文件名称 - String fileName = fileUploadApi.upload(file); - String fileNames = fileName.replaceAll("/profile/", filePath); - ProcessBuilder pb = new ProcessBuilder(aaptTool, "d", "badging", fileNames); - Process p = pb.start(); - InputStream is = p.getInputStream(); - BufferedReader reader = new BufferedReader(new InputStreamReader(is), 8192); - apkInfo.setSize(new File(fileName).length()); - String temp = null; - while ((temp = reader.readLine()) != null) { - setApkInfoProperty(apkInfo, temp); - } - is.close(); - appUpload.setUploadPath(fileName); - appUpload.setAppVersion(apkInfo.getVersionName()); - System.err.println(apkInfo.getVersionName()); - } - -} diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/resources/mapper/AppUploadMapper.xml b/lib/EmergencyService/zdxtEmergencyAppService/src/main/resources/mapper/AppUploadMapper.xml deleted file mode 100644 index ba57a313..00000000 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/resources/mapper/AppUploadMapper.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - app_id, app_version, app_describe, app_status, uploadTime, upload_by, upload_path - - - - - - insert into app_upload - - app_id, - app_version, - app_describe, - app_status, - uploadTime, - upload_by, - upload_path, - - - #{appId}, - #{appVersion}, - #{appDescribe}, - #{appStatus}, - #{uploadTime}, - #{uploadBy}, - #{uploadPath}, - - - - update app_upload - - app_version=#{appVersion}, - app_describe=#{appDescribe}, - app_status=#{appStatus}, - upload_path=#{uploadPath}, - - where app_id = #{appId} - - - update app_upload - - app_status = #{appStatus} - - where app_id = #{appId} - - - update app_upload - - app_status = 1 - - - - delete from app_upload where app_id = #{appId} - - - delete from app_upload where app_id in - - #{appId} - - - - \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/resources/mapper/oraacle/AppUploadOracleDao.xml b/lib/EmergencyService/zdxtEmergencyAppService/src/main/resources/mapper/oraacle/AppUploadOracleDao.xml deleted file mode 100644 index bf63366b..00000000 --- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/resources/mapper/oraacle/AppUploadOracleDao.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - - - - - - - - app_id, app_version, app_describe, app_status, uploadTime, upload_by, upload_path - - - - - - insert into app_upload - - app_id, - app_version, - app_describe, - app_status, - uploadTime, - upload_by, - upload_path, - - - #{appId}, - #{appVersion}, - #{appDescribe}, - #{appStatus}, - #{uploadTime}, - #{uploadBy}, - #{uploadPath}, - - - - update app_upload - - app_version=#{appVersion}, - app_describe=#{appDescribe}, - app_status=#{appStatus}, - upload_path=#{uploadPath}, - - where app_id = #{appId} - - - update app_upload - - app_status = #{appStatus} - - where app_id = #{appId} - - - update app_upload - - app_status = 1 - - - - delete from app_upload where app_id = #{appId} - - - delete from app_upload where app_id in - - #{appId} - - - - \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DistrictApiImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DistrictApiImpl.java deleted file mode 100644 index d97fa40e..00000000 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/feign/DistrictApiImpl.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.zdxt.auth.feign; - -import com.zdxt.auth.dto.DistrictBean; -import com.zdxt.auth.project.system.district.damain.District; -import com.zdxt.auth.project.system.district.mapper.DistrictMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.ArrayList; -import java.util.List; - -/** - * @program: EmergencyBaseLib - * @description: 行政区域Api实现 - * @author: chenkun - * @create: 2020-03-23 19:29 - **/ -@Service -public class DistrictApiImpl implements DistrictApi{ - - @Autowired - DistrictMapper districtMapper; - - @Override - public List getAllProvince() { - ArrayList resultList = new ArrayList<>(); - String districtCode = new String("0000"); - List list = districtMapper.getAllProvince(districtCode); - if(list.size()>0){ - for(District district:list){ - DistrictBean districtBean = transformDate(district); - resultList.add(districtBean); - } - } - return resultList; - } - - @Override - public List selectCitiesByProvinceCode(String provinceCode) { - ArrayList resultList = new ArrayList<>(); - if(!provinceCode.equals("")){ - String code = provinceCode.substring(0, 2); - District district = new District(); - district.setDistrictCode(code); - List districtList = districtMapper.selectDistrictList(district); - if(districtList.size()>0){ - for(District district1:districtList){ - String districtCode = district1.getDistrictCode(); - if(!districtCode.substring(2,4).equals("00") && districtCode.substring(4,6).equals("00")){ - DistrictBean districtBean = transformDate(district1); - resultList.add(districtBean); - } - } - } - } - return resultList; - } - - @Override - public List selectCountiesByCityCode(String cityCode) { - ArrayList resultList = new ArrayList<>(); - if(!cityCode.equals("")){ - String code = cityCode.substring(0, 4); - District district = new District(); - district.setDistrictCode(code); - List districtList = districtMapper.selectDistrictList(district); - if(districtList.size()>0){ - for(District district1:districtList){ - if(!district1.getDistrictCode().substring(4,6).equals("00")){ - DistrictBean districtBean = transformDate(district1); - resultList.add(districtBean); - } - } - } - } - return resultList; - } - - @Override - public String[] getDistrictByCode(String districtCode) { - String[] strings1 = new String[3]; - String[] strings2 = new String[3]; - strings2[0] = districtCode.substring(0, 2)+"0000"; - strings2[1] = districtCode.substring(0, 4) + "00"; - strings2[2] = districtCode; - for(int i=0;i districtList = districtMapper.selectDistrictList(district); - if(districtList.size()==1){ - strings1[i] = districtList.get(0).getDistictName(); - } - } - return strings1; - } - - /** - * 实体类与javaBean转换 - * @param district - * @return - */ - private DistrictBean transformDate(District district){ - DistrictBean districtBean = new DistrictBean(); - districtBean.setDistrictId(district.getDistrictId()); - districtBean.setDistrictCode(district.getDistrictCode()); - districtBean.setDistictName(district.getDistictName()); - return districtBean; - } -} diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/controller/DistrictController.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/controller/DistrictController.java deleted file mode 100644 index c5e4ff90..00000000 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/controller/DistrictController.java +++ /dev/null @@ -1,125 +0,0 @@ -package com.zdxt.auth.project.system.district.controller; - -import com.zdxt.auth.common.utils.poi.ExcelUtil; -import com.zdxt.auth.framework.web.controller.BaseController; -import com.zdxt.auth.framework.web.domain.AjaxResult; -import com.zdxt.auth.framework.web.page.TableDataInfo; -import com.zdxt.auth.project.system.district.damain.District; -import com.zdxt.auth.project.system.district.service.DistrictService; -import com.zdxt.log.aspectj.lang.annotation.Log; -import com.zdxt.log.aspectj.lang.enums.BusinessType; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; - -/** - * @program: EmergencyBaseLib - * @description: 行政区划Controller - * @author: chenkun - * @create: 2020-03-23 11:47:34 - **/ -@Controller -@RequestMapping("system/district") -public class DistrictController extends BaseController { - - @Autowired - DistrictService districtService; - - private String prefix = "system/district"; - - @RequiresPermissions("system:district:view") - @GetMapping("/view") - public String distict() - { - return prefix + "/district"; - } - - /** - * 查询行政区划列表 - */ - @RequiresPermissions("system:district:list") - @PostMapping("/list") - @ResponseBody - public TableDataInfo list(District district) - { - startPage(); - List list = new ArrayList<>(); - list = districtService.selectDistrict(district); - return getDataTable(list); - } - - - /** - * 新增行政区划页面 - */ - @GetMapping("/add") - public String add() - { - return prefix + "/add"; - } - - /** - * 新增保存危险源数据 - */ - @RequiresPermissions("system:district:add") - @Log(title = "行政区划", businessType = BusinessType.INSERT) - @PostMapping("/add") - @ResponseBody - public AjaxResult addSave(District district) - { - return toAjax(districtService.insertDistrict(district)); - } - - /** - * 修改行政区划数据 - */ - @GetMapping("/edit/{id}") - public String edit(@PathVariable("id") String id, ModelMap mmap) - { - District district = districtService.selectDistrictById(id); - mmap.put("District", district); - return prefix + "/edit"; - } - - /** - * 查看详情 - */ - @RequiresPermissions("system:district:detail") - @GetMapping("/detail/{id}") - public String detail(@PathVariable("id") String id, ModelMap mmap) - { - District district = districtService.selectDistrictById(id); - mmap.put("District", district); - return prefix + "/detail"; - } - - - /** - * 修改保存区划数据 - */ - @RequiresPermissions("system:district:edit") - @Log(title = "重大危险源", businessType = BusinessType.UPDATE) - @PostMapping("/edit") - @ResponseBody - public AjaxResult editSave(District district) - { - return toAjax(districtService.updateDistrict(district)); - } - - /** - * 删除行政区划数据 - */ - @RequiresPermissions("system:district:remove") - @Log(title = "行政区划", businessType = BusinessType.DELETE) - @PostMapping( "/remove") - @ResponseBody - public AjaxResult remove( String ids) - { - return toAjax(districtService.deleteDistrictById(ids)); - } - -} diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/damain/District.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/damain/District.java deleted file mode 100644 index 8042e24d..00000000 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/damain/District.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.zdxt.auth.project.system.district.damain; - -import java.util.Date; - -/** - * @program: EmergencyBaseLib - * @description: 行政区划实体类 - * @author: chenkun - * @create: 2020-03-23 09:35 - **/ -public class District { - - //行政区划ID - private String districtId; - //行政区划编码 - private String districtCode; - //行政区划名称 - private String distictName; - //启用日期 - private Date startDate; - //停用日期 - private Date disableDate; - //数据来源单位 - private String sourceUnit; - //该数据的最近更新时间 - private Date updateTime; - //备注 - private String remark; - //数据状态 - private Integer status; - - public String getDistrictId() { - return districtId; - } - - public void setDistrictId(String districtId) { - this.districtId = districtId; - } - - public String getDistrictCode() { - return districtCode; - } - - public void setDistrictCode(String districtCode) { - this.districtCode = districtCode; - } - - public String getDistictName() { - return distictName; - } - - public void setDistictName(String distictName) { - this.distictName = distictName; - } - - public Date getStartDate() { - return startDate; - } - - public void setStartDate(Date startDate) { - this.startDate = startDate; - } - - public Date getDisableDate() { - return disableDate; - } - - public void setDisableDate(Date disableDate) { - this.disableDate = disableDate; - } - - public String getSourceUnit() { - return sourceUnit; - } - - public void setSourceUnit(String sourceUnit) { - this.sourceUnit = sourceUnit; - } - - public Date getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(Date updateTime) { - this.updateTime = updateTime; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - -} diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/mapper/DistrictMapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/mapper/DistrictMapper.java deleted file mode 100644 index 9748e930..00000000 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/mapper/DistrictMapper.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.zdxt.auth.project.system.district.mapper; - -import com.zdxt.auth.project.system.district.damain.District; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * @program: EmergencyBaseLib - * @description: 行政区划Mapper - * @author: chenkun - * @create: 2020-03-23 09:43 - **/ -@Repository -public interface DistrictMapper { - - /** - * 综合查询行政区划列表 - * @param district - * @return - */ - List selectDistrictList(District district); - - /** - * 根据行政区划ID获取实体信息 - * @param districId - * @return - */ - District selectDistrictListById(String districId); - - /** - * 新增行政区划数据 - * @param district - * @return - */ - int insertDistrict(District district); - - /** - * 更新行政区划数据 - * @param district - * @return - */ - int updateDistrict(District district); - - /** - * 根据ID删除行政区划数据 - * @param districtId - * @return - */ - int deleteDistrict(String districtId); - - /** - * 根据标识符查询所有省份信息 - * @param districtCode - * @return - */ - List getAllProvince(String districtCode); - -} diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/service/DistrictService.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/service/DistrictService.java deleted file mode 100644 index a50b9be0..00000000 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/service/DistrictService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.zdxt.auth.project.system.district.service; - -import com.zdxt.auth.project.system.district.damain.District; - -import java.util.List; - -/** - * @program: EmergencyBaseLib - * @description: 行政区划Service - * @author: chenkun - * @create: 2020-03-23 09:44 - **/ -public interface DistrictService { - - List selectDistrict(District district); - - District selectDistrictById(String districtId); - - int updateDistrict(District district); - - int insertDistrict(District district); - - int deleteDistrictById(String districtId); - - /** - * 根据完整行政代码获取省市区县名称 - * @param districtCode - * @return - */ - String[] getDistrictByCode(String districtCode); -} diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/service/impl/DistrictServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/service/impl/DistrictServiceImpl.java deleted file mode 100644 index 31c61642..00000000 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/district/service/impl/DistrictServiceImpl.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.zdxt.auth.project.system.district.service.impl; - -import com.zdxt.auth.common.utils.DateUtils; -import com.zdxt.auth.project.system.district.damain.District; -import com.zdxt.auth.project.system.district.mapper.DistrictMapper; -import com.zdxt.auth.project.system.district.service.DistrictService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; -import java.util.UUID; - -/** - * @program: EmergencyBaseLib - * @description: 行政区划ServiceImpl - * @author: chenkun - * @create: 2020-03-23 09:44 - **/ -@Service -public class DistrictServiceImpl implements DistrictService { - - @Autowired - DistrictMapper districtMapper; - - @Override - public List selectDistrict(District district) { - return districtMapper.selectDistrictList(district); - } - - @Override - public District selectDistrictById(String districtId) { - return districtMapper.selectDistrictListById(districtId); - } - - @Override - public int updateDistrict(District district) { - if(district.getStatus() == 1){ - district.setDisableDate(DateUtils.dateTime("yyyy-MM-dd","2099-01-01")); - district.setStartDate(DateUtils.getNowDate()); - }else{ - district.setStartDate(DateUtils.dateTime("yyyy-MM-dd","2099-01-01")); - district.setDisableDate(DateUtils.getNowDate()); - } - district.setUpdateTime(DateUtils.getNowDate()); - return districtMapper.updateDistrict(district); - } - - @Override - public int insertDistrict(District district) { - district.setDistrictId(UUID.randomUUID().toString()); - if(district.getStatus() == 1){ - district.setDisableDate(DateUtils.dateTime("yyyy-MM-dd","2099-01-01")); - district.setStartDate(DateUtils.getNowDate()); - }else{ - district.setStartDate(DateUtils.dateTime("yyyy-MM-dd","2099-01-01")); - district.setDisableDate(DateUtils.getNowDate()); - } - return districtMapper.insertDistrict(district); - } - - @Override - public int deleteDistrictById(String districtId) { - return districtMapper.deleteDistrict(districtId); - } - - - @Override - public String[] getDistrictByCode(String districtCode) { - String[] strings1 = new String[3]; - String[] strings2 = new String[3]; - strings2[0] = districtCode.substring(0, 2)+"0000"; - strings2[1] = districtCode.substring(0, 4) + "00"; - strings2[2] = districtCode; - for(int i=0;i districtList = districtMapper.selectDistrictList(district); - if(districtList.size()==1){ - strings1[i] = districtList.get(0).getDistictName(); - } - } - return strings1; - } -} diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/district/DistrictMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/district/DistrictMapper.xml deleted file mode 100644 index 4f44fdcb..00000000 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/district/DistrictMapper.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - select DistrictId, DistrictCode, DistrictName, StartDate, DisableDate, SourceUnit, UpdateTime, Remarks, Status - from bas_district - - - - - - - - delete from bas_district where DistrictId = #{districtId} - - - - update bas_district - - DistrictCode = #{districtCode}, - DistrictName = #{distictName}, - StartDate = #{startDate}, - DisableDate = #{disableDate}, - SourceUnit = #{sourceUnit}, - UpdateTime = #{updateTime}, - Remarks = #{remark}, - Status = #{status}, - - where DistrictId = #{districtId} - - - - insert into bas_district( - DistrictId , - DistrictCode, - DistrictName, - StartDate, - DisableDate, - SourceUnit, - UpdateTime, - Remarks, - Status - )values( - #{districtId}, - #{districtCode}, - #{distictName}, - #{startDate}, - #{disableDate}, - #{sourceUnit}, - #{updateTime}, - #{remark}, - #{status} - ) - - - - \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/district/DistrictOracleDao.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/district/DistrictOracleDao.xml deleted file mode 100644 index 2fb4df7c..00000000 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/district/DistrictOracleDao.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - select DistrictId, DistrictCode, DistrictName, StartDate, DisableDate, SourceUnit, UpdateTime, Remarks, Status - from bas_district - - - - - - - - delete from bas_district where DistrictId = #{districtId} - - - - update bas_district - - DistrictCode = #{districtCode}, - DistrictName = #{distictName}, - StartDate = #{startDate}, - DisableDate = #{disableDate}, - SourceUnit = #{sourceUnit}, - UpdateTime = #{updateTime}, - Remarks = #{remark}, - Status = #{status}, - - where DistrictId = #{districtId} - - - - insert into bas_district( - DistrictId , - DistrictCode, - DistrictName, - StartDate, - DisableDate, - SourceUnit, - UpdateTime, - Remarks, - Status - )values( - #{districtId}, - #{districtCode}, - #{distictName}, - #{startDate}, - #{disableDate}, - #{sourceUnit}, - #{updateTime}, - #{remark}, - #{status} - ) - - - - \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/address/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/address/view.html deleted file mode 100644 index 8cccb4ff..00000000 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/address/view.html +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - -
-
-
-
-
- -
-
-
- -
- -
-
-
-
-
-
- - - - \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/appUpload/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/appUpload/add.html deleted file mode 100644 index 7d557ed3..00000000 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/appUpload/add.html +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - - - - \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/appUpload/appUpload.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/appUpload/appUpload.html deleted file mode 100644 index a6224a7a..00000000 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/appUpload/appUpload.html +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - -
-
-
-
-
-
- -
-
-
- - -
-
-
-
-
-
- - - - - - - \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/appUpload/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/appUpload/edit.html deleted file mode 100644 index 99a79cc5..00000000 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/appUpload/edit.html +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
-
- - - - - - - \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/district/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/district/add.html deleted file mode 100644 index ce9405b5..00000000 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/district/add.html +++ /dev/null @@ -1,78 +0,0 @@ - - - - - - - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- - - - - diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/district/district.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/district/district.html deleted file mode 100644 index 451fc03e..00000000 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/district/district.html +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - -
-
-
-
- -
-
-
- - -
-
-
-
- - - - - - \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/district/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/district/edit.html deleted file mode 100644 index 5ded786e..00000000 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/district/edit.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - -
-
- -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
- -
-
- -
- -
-
-
-
- - - - - \ No newline at end of file diff --git a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DistrictApi.java b/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DistrictApi.java deleted file mode 100644 index 62d7ccdc..00000000 --- a/lib/EmergencyServiceApi/emergencyAuthServiceApi/src/main/java/com/zdxt/auth/feign/DistrictApi.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.zdxt.auth.feign; - -import com.zdxt.auth.dto.DistrictBean; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 文件上传API - * - * @author chenkun - * @date 2020/3/23 16:44 - */ -@Api(tags="行政区划API") -@RestController -@RequestMapping("/api/district") -public interface DistrictApi { - - /** - * 获取所有省份信息 - * @return - */ - @ApiOperation(value = "获取所有省份信息") - @GetMapping("/getAllProvincies") - public List getAllProvince(); - - /** - * 根据省区域代码获取市信息 - * @param provinceCode - * @return - */ - @ApiOperation(value = "根据省区域代码获取市信息") - @ApiImplicitParam(name = "provinceCode",value = "省区域编号",required = true, dataType = "String",paramType = "path") - @GetMapping("/getCities/{provinceCode}") - public List selectCitiesByProvinceCode(@PathVariable(name = "provinceCode") String provinceCode); - - /** - * 根据市区域代码获取区县信息 - * @param cityCode - * @return - */ - @ApiOperation(value = "根据市区域代码获取区县信息") - @ApiImplicitParam(name = "cityCode",value = "市区域编号",required = true, dataType = "String",paramType = "path") - @GetMapping("/getCounties/{cityCode}") - public List selectCountiesByCityCode(@PathVariable(name = "cityCode") String cityCode); - - /** - * 根据行政区域编号获取省、市、区县数组 - * @param districtCode - * @return - */ - String[] getDistrictByCode(String districtCode); -}