From 9f2fc2b4f2de1b852d94bbe5a9bb21c4e9ef9ce0 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Thu, 10 Feb 2022 14:38:14 +0800
Subject: [PATCH] 服务范围列表修改地区码传参方式

---
 screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java |   64 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
index 0eaf937..7057c08 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java
@@ -1,22 +1,28 @@
 package com.moral.api.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.moral.api.entity.Supervision;
+import com.moral.api.entity.SysArea;
 import com.moral.api.mapper.SupervisionMapper;
 import com.moral.api.service.SupervisionService;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.service.SysAreaService;
 import com.moral.constant.Constants;
 import com.moral.constant.ResponseCodeEnum;
 import com.moral.util.FileUtils;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.system.ApplicationHome;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -35,17 +41,22 @@
  * @since 2022-01-12
  */
 @Service
+@Slf4j
 public class SupervisionServiceImpl extends ServiceImpl<SupervisionMapper, Supervision> implements SupervisionService {
 
     @Autowired
     private SupervisionMapper supervisionMapper;
 
+    @Autowired
+    private SysAreaService sysAreaService;
+
     @Override
+    @Transactional
     public Map<String, Object> add(MultipartFile[] files, Supervision supervision) {
         //������jar���������������
-        ApplicationHome h = new ApplicationHome(getClass());
+        ApplicationHome applicationHome = new ApplicationHome(getClass());
         //���jar������������������������������upload������������������������������������
-        String path = h.getSource().getParentFile().toString() + "/static/img";
+        String path = applicationHome.getSource().getParentFile().toString() + "/static/img";
 
         Map<String, Object> result = new HashMap<>();
 
@@ -109,22 +120,39 @@
         supervisionMapper.selectPage(supervisionPage, queryWrapper);
         List<Supervision> supervisions = supervisionPage.getRecords();
 
+        //������������������
+        List<Map<String, Object>> item = new ArrayList<>();
+        QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>();
+        sysAreaQueryWrapper.eq("area_code", cityCode);
+        SysArea one = sysAreaService.getOne(sysAreaQueryWrapper);
+        String cityName = one.getAreaName();
+        for (Supervision supervision : supervisions) {
+            Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(supervision), Map.class);
+            map.remove("isDelete");
+            map.remove("createTime");
+            map.remove("updateTime");
+            map.put("cityName", cityName);
+            item.add(map);
+        }
 
         Map<String, Object> result = new LinkedHashMap<>();
         result.put("total", supervisionPage.getTotal());
         result.put("totalPage", supervisionPage.getPages());
         result.put("current", supervisionPage.getCurrent());
         result.put("pageSize", supervisionPage.getSize());
-        result.put("item", supervisions);
+        result.put("item", item);
 
         return result;
     }
 
     @Override
+    @Transactional
     public Map<String, Object> updateSupervision(MultipartFile[] files, Supervision supervision) {
 
-        String path = this.getClass().getClassLoader()
-                .getResource("").getFile() + "static/img/";
+        //������jar���������������
+        ApplicationHome applicationHome = new ApplicationHome(getClass());
+        //���jar������������������������������upload������������������������������������
+        String path = applicationHome.getSource().getParentFile().toString() + "/static/img";
 
         Map<String, Object> result = new HashMap<>();
 
@@ -160,4 +188,30 @@
         supervisionMapper.updateById(supervision);
         return result;
     }
+
+    @Override
+    @Transactional
+    public void deleteSupervision(Integer supervisionId) {
+        QueryWrapper<Supervision> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("id", "images").eq("id", supervisionId);
+        Supervision supervision = supervisionMapper.selectOne(queryWrapper);
+        String[] images = supervision.getImages().split(",");
+
+        //������������
+        supervision.setIsDelete(Constants.DELETE);
+        supervision.setImages(null);
+        supervisionMapper.updateById(supervision);
+
+
+        //���������������������������������������
+        ApplicationHome applicationHome = new ApplicationHome(getClass());
+        String path = applicationHome.getSource().getParentFile().toString() + "/static/img";
+        for (String image : images) {
+            String realPath = path + File.separator + image;
+            File file = new File(realPath);
+            if (file.exists() && file.isFile()) {
+                file.delete();
+            }
+        }
+    }
 }

--
Gitblit v1.8.0