blame | history | patch | commit | commitdiff | ignore whitespace
lizijie
2022-02-10 0c29adcf7692ad992c70ff1207d7d098a635535c 
 screen-api/src/main/java/com/moral/api/service/impl/SupervisionServiceImpl.java


@@ -1,12 +1,15 @@


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;


@@ -15,6 +18,7 @@


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;




@@ -43,7 +47,11 @@


    @Autowired


    private SupervisionMapper supervisionMapper;




    @Autowired


    private SysAreaService sysAreaService;




    @Override


    @Transactional


    public Map<String, Object> add(MultipartFile[] files, Supervision supervision) {


        //获取jar包所在目录


        ApplicationHome applicationHome = new ApplicationHome(getClass());


@@ -112,18 +120,33 @@


        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) {




        //获取jar包所在目录


@@ -167,6 +190,7 @@


    }




    @Override


    @Transactional


    public void deleteSupervision(Integer supervisionId) {


        QueryWrapper<Supervision> queryWrapper = new QueryWrapper<>();


        queryWrapper.select("id", "images").eq("id", supervisionId);