From cfba70aa1a1ef59df304366770a7a518062ff0e6 Mon Sep 17 00:00:00 2001
From: DYL0109 <1332079466@qq.com>
Date: 星期一, 20 一月 2025 18:07:00 +0800
Subject: [PATCH] !30 优化 Merge pull request !30 from DYL0109/develop1.0
---
zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterAnnexController.java | 50 +++++++++---------------
zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterController.java | 13 ++----
2 files changed, 24 insertions(+), 39 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterAnnexController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterAnnexController.java
index 5ed7ca9..5b8242d 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterAnnexController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterAnnexController.java
@@ -29,27 +29,26 @@
/**
* 璁￠噺鍣ㄥ叿妗ｆ闄勪欢Controller
- *
+ *
* @author zhaowei
* @date 2020-02-14
*/
@RestController
@RequestMapping("/meter/annex")
-public class MeterAnnexController extends BaseController
-{
+public class MeterAnnexController extends BaseController {
@Autowired
private IMeterAnnexService meterAnnexService;
@Autowired
private TokenService tokenService;
private static final Logger log = LoggerFactory.getLogger(MeterAnnexController.class);
+
/**
* 鏌ヨ璁￠噺鍣ㄥ叿妗ｆ闄勪欢鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('meter:annex:list')")
@GetMapping("/list")
- public TableDataInfo list(MeterAnnex meterAnnex)
- {
+ public TableDataInfo list(MeterAnnex meterAnnex) {
startPage();
List<MeterAnnex> list = meterAnnexService.selectMeterAnnexList(meterAnnex);
return getDataTable(list);
@@ -61,8 +60,7 @@
@PreAuthorize("@ss.hasPermi('meter:annex:export')")
@Log(title = "璁￠噺鍣ㄥ叿妗ｆ闄勪欢", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(MeterAnnex meterAnnex)
- {
+ public AjaxResult export(MeterAnnex meterAnnex) {
List<MeterAnnex> list = meterAnnexService.selectMeterAnnexList(meterAnnex);
ExcelUtil<MeterAnnex> util = new ExcelUtil<MeterAnnex>(MeterAnnex.class);
return util.exportExcel(list, "annex");
@@ -73,8 +71,7 @@
*/
@PreAuthorize("@ss.hasPermi('meter:annex:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") String id)
- {
+ public AjaxResult getInfo(@PathVariable("id") String id) {
return AjaxResult.success(meterAnnexService.selectMeterAnnexById(id));
}
@@ -84,8 +81,7 @@
@PreAuthorize("@ss.hasPermi('meter:annex:add')")
@Log(title = "璁￠噺鍣ㄥ叿妗ｆ闄勪欢", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody MeterAnnex meterAnnex)
- {
+ public AjaxResult add(@RequestBody MeterAnnex meterAnnex) {
return toAjax(meterAnnexService.insertMeterAnnex(meterAnnex));
}
@@ -95,8 +91,7 @@
@PreAuthorize("@ss.hasPermi('meter:annex:edit')")
@Log(title = "璁￠噺鍣ㄥ叿妗ｆ闄勪欢", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody MeterAnnex meterAnnex)
- {
+ public AjaxResult edit(@RequestBody MeterAnnex meterAnnex) {
return toAjax(meterAnnexService.updateMeterAnnex(meterAnnex));
}
@@ -105,9 +100,8 @@
*/
@PreAuthorize("@ss.hasPermi('meter:annex:remove')")
@Log(title = "璁￠噺鍣ㄥ叿妗ｆ闄勪欢", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable String[] ids)
- {
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(meterAnnexService.deleteMeterAnnexByIds(ids));
}
@@ -115,15 +109,13 @@
* 閫氱敤鎸囧畾鏂囦欢涓嬭浇璇锋眰
*
* @param showFileName 涓嬭浇灞曠ず鏂囦欢鍚嶇О
-// * @param filePath 涓嬭浇鏂囦欢缁濆璺緞 甯� 鏂囦欢鐪熷疄鍚嶅瓧鍙婅矾寰�
- * @param delete 鏄惁鍒犻櫎/
+ * // * @param filePath 涓嬭浇鏂囦欢缁濆璺緞 甯� 鏂囦欢鐪熷疄鍚嶅瓧鍙婅矾寰�
+ * @param delete 鏄惁鍒犻櫎/
*/
@PreAuthorize("@ss.hasPermi('meter:annex:assignDownload')")
@PostMapping("/assignDownload")
- public void fileAssignDownload(String showFileName, String filePath,Boolean delete, HttpServletResponse response, HttpServletRequest request)
- {
- try
- {
+ public void fileAssignDownload(String showFileName, String filePath, Boolean delete, HttpServletResponse response, HttpServletRequest request) {
+ try {
response.setCharacterEncoding("utf-8");
response.setContentType("multipart/form-data");
response.setHeader("Content-Disposition",
@@ -134,19 +126,16 @@
// FileUtils.deleteFile(filePath);
// }
log.error("涓嬭浇鎴愬姛", "aa");
- }
- catch (Exception e)
- {
+ } catch (Exception e) {
log.error("涓嬭浇鏂囦欢澶辫触", e);
}
}
+
@Log(title = "璁￠噺鍣ㄥ叿妗ｆ闄勪欢涓婁紶", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('meter:annex:fileImport')")
@PostMapping("/fileImport")
- public AjaxResult importData(MultipartFile file, String implementId) throws Exception
- {
- if (!file.isEmpty())
- {
+ public AjaxResult importData(MultipartFile file, String implementId) throws Exception {
+ if (!file.isEmpty()) {
LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
//鑾峰彇閰嶇疆鐨勬枃浠朵笂浼犺矾寰�
String uploadPathDir = BaseConfig.getUploadPath();
@@ -169,8 +158,7 @@
meterAnnex.setFileSuffix(fileSuffix);
meterAnnex.setImplementId(implementId);
meterAnnex.setCreateBy(loginUser.getUsername());
- if (this.meterAnnexService.insertMeterAnnex(meterAnnex)>0)
- {
+ if (this.meterAnnexService.insertMeterAnnex(meterAnnex) > 0) {
return AjaxResult.success("闄勪欢涓婁紶瀹屾垚");
}
}
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterController.java
index df3d84f..6ff0ef5 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/meter/MeterController.java
@@ -37,14 +37,12 @@
private IMetersService iMeterservice;
-
-
@ApiOperation("鑾峰彇璁￠噺琛ㄦ暟鎹�")
@GetMapping("/listMeterData")
- public R<List<MeterImplements>> listMeterData(@RequestParam String meterType){
+ public R<List<MeterImplements>> listMeterData(@RequestParam String meterType) {
log.info("寮�濮嬭幏鍙栬閲忚〃鏁版嵁......");
List<MeterImplements> meterImplementList = iMeterservice.listMeterData(meterType);
- if (meterImplementList != null || meterImplementList .size() > 0) {
+ if (meterImplementList != null || meterImplementList.size() > 0) {
return R.ok(meterImplementList);
} else {
return R.fail("鑾峰彇璁￠噺琛ㄦ暟鎹け璐�");
@@ -56,8 +54,8 @@
public R<List<MeterParam>> listConfigurationData(@RequestParam String meterType, @RequestParam String indexType) {
log.info("寮�濮嬭幏鍙栫偣浣嶉厤缃俊鎭�......");
- List<MeterParam> meterParams = iMeterservice.listConfigurationData(meterType,indexType);
- if (meterParams != null || meterParams .size() > 0) {
+ List<MeterParam> meterParams = iMeterservice.listConfigurationData(meterType, indexType);
+ if (meterParams != null || meterParams.size() > 0) {
return (R.ok(meterParams));
} else {
return R.fail("鑾峰彇鐐逛綅閰嶇疆淇℃伅澶辫触");
@@ -82,12 +80,11 @@
@ApiOperation("鏂板淇濆瓨閰嶇疆鏁版嵁")
@GetMapping("/addConfigurationData")
- public R<T> addConfigurationData(){
+ public R<T> addConfigurationData() {
log.info("鎵ц鏂板淇濆瓨閰嶇疆鏁版嵁......");
return R.ok();
}
-
}
--
Gitblit v1.9.3