cjl
2023-11-02 c42f96a775a87ec0349580c0ab699a00fef5a2d0
fix:走航报告小数位添加
8 files modified
152 ■■■■ changed files
screen-api/src/main/java/com/moral/api/controller/CruiserController.java 87 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/mapper/OrganizationMapper.java 6 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java 16 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java 6 ●●●● patch | view | raw | blame | history
screen-api/src/main/resources/mapper/OrganizationMapper.xml 35 ●●●●● patch | view | raw | blame | history
screen-api/src/main/resources/word/尘负荷监测报告.docx patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java 1 ●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java 1 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/CruiserController.java
@@ -2,11 +2,11 @@
import cn.afterturn.easypoi.word.WordExportUtil;
import cn.hutool.poi.word.WordUtil;
import com.deepoove.poi.NiceXWPFDocument;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.data.MiniTableRenderData;
import com.deepoove.poi.config.Configure;
import com.deepoove.poi.data.RowRenderData;
import com.deepoove.poi.data.TextRenderData;
import com.deepoove.poi.policy.HackLoopTableRenderPolicy;
import com.moral.api.entity.Dustld;
import com.moral.api.pojo.bo.ExcelBO;
import com.moral.api.pojo.dto.historySecondCruiser.HistorySecondCruiserResultDTO;
@@ -24,7 +24,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.io.FileUtils;
import org.apache.poi.xwpf.usermodel.XWPFDocument;
import org.apache.xmlbeans.impl.jam.provider.ResourcePath;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
@@ -315,29 +314,44 @@
    }
    public static void test( Map<String, Object> params,HttpServletResponse response) throws IOException {
        InputStream  inputStream = WordUtil.class.getClassLoader().getResourceAsStream("word/尘负荷监测报告.docx");
        XWPFDocument compile = null;
    public  void test( Map<String, Object> params,HttpServletResponse response) throws IOException {
        try {
            //InputStream  inputStream = WordUtil.class.getClassLoader().getResourceAsStream("word/尘负荷监测报告.docx");
            InputStream stream = WordUtil.class.getClassLoader().getResourceAsStream("word/尘负荷监测报告.docx");
            //获取临时文件
            File file = new File("word/尘负荷监测报告.docx");
            //将读取到的类容存储到临时文件中,后面就可以用这个临时文件访问了
            FileUtils.copyInputStreamToFile(stream, file);
            //这个时候再去获取证书的文件路径 就可以正常获取了
            String filePath = file.getAbsolutePath();
            //第二步:创建数据,用于把我们模板中的{{}}包裹的变量替换掉,map中保存的key一定要和模板中的变量保持一致
            HashMap<String, Object> map = new HashMap<>();
            //设置单元格,表头
            RowRenderData header1 = RowRenderData.build(new TextRenderData("6495ED", "序号"), new TextRenderData("6495ED", "道路"),new TextRenderData("6495ED", "平均尘负荷(克/平方米)"));
            //RowRenderData header1 = RowRenderData.build(new TextRenderData("6495ED", "序号"), new TextRenderData("6495ED", "道路"),new TextRenderData("6495ED", "平均尘负荷(克/平方米)"));
            //设置表内容,如果在实际应用中,传入一个list集合或者数组,方可用foreach进行循环填充
            List<DustForm> list1 = (List<DustForm>) params.get("list1");
            ArrayList<Map<String, Object>> mapArrayList = (ArrayList<Map<String, Object>>) params.get("list3");
            List<Map<String, Object>> mapArrayList = (ArrayList<Map<String, Object>>) params.get("list3");
            ArrayList<RowRenderData> rsList1 = new ArrayList<>();
            ArrayList<RowRenderData> rsList3 = new ArrayList<>();
            List<Map> detailList = new ArrayList<>();
            for (int i = 0; i < list1.size(); i++) {
                DustForm dustForm = list1.get(i);
                RowRenderData row0 = RowRenderData.build(i+1+"",dustForm.getRoad(), dustForm.getValue()+"");
                rsList1.add(row0);
                Map maps = new HashMap();
                maps.put("table1", i+1);
                maps.put("table2", dustForm.getRoad());
                maps.put("table3", dustForm.getValue());
                detailList.add(maps);
               /* RowRenderData row0 = RowRenderData.build(i+1+"",dustForm.getRoad(), dustForm.getValue()+"");
                rsList1.add(row0);*/
            }
            for (int i = 0; i < mapArrayList.size(); i++) {
            /*for (int i = 0; i < mapArrayList.size(); i++) {
                Map<String, Object> map1 = mapArrayList.get(i);
                RowRenderData row = RowRenderData.build(i + 1 + "", map1.get("road").toString(), map1.get("value1").toString(), map1.get("value2").toString(), map1.get("value3").toString());
                rsList3.add(row);
@@ -345,26 +359,57 @@
            if (!ObjectUtils.isEmpty(mapArrayList)){
                map.put("table3", new MiniTableRenderData(rsList3));
            }
            map.put("table1", new MiniTableRenderData(header1, rsList1));
            map.put("table1", new MiniTableRenderData(header1, rsList1));*/
            String data = params.get("data").toString();
            map.put("data",data);
            map.put("time",params.get("time").toString());
            map.put("date1",params.get("date1").toString());
            map.put("date2",params.get("date2").toString());
            File docxFile = new File("尘负荷监测报告.docx");
            //map.put("detailList",detailList);
            /*File docxFile = new File("尘负荷监测报告.docx");
            FileUtils.copyToFile(inputStream,docxFile);
            compile = WordExportUtil.exportWord07(docxFile.getPath(),map);
            compile.write(response.getOutputStream());
            inputStream.close();*/
            //XWPFDocument compile = WordExportUtil.exportWord07(filePath,map);
            HackLoopTableRenderPolicy policy = new HackLoopTableRenderPolicy();
            Configure config = Configure.newBuilder().bind("detailList", policy).build();
            XWPFTemplate compile = XWPFTemplate.compile(filePath,config).render(new HashMap<String, Object>(){{
                put("time",map.get("time"));
                put("data",map.get("data"));
                put("data1",map.get("data1"));
                put("data2",map.get("data2"));
                put("detailList", detailList);
            }});
            response.setContentType("multipart/form-data");
            // 设置文件名
            response.addHeader("Content-Disposition", "attachment;fileName=ce.docx" );
            response.setCharacterEncoding("UTF-8");
            OutputStream out = response.getOutputStream();
            compile.write(out);
            out.flush();
            out.close();
            compile.close();
            inputStream.close();
/*
            ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
            compile.write(byteArrayOutputStream);
            byte[] bytes = byteArrayOutputStream.toByteArray();
            response.setCharacterEncoding("utf-8");
            response.setContentType("multipart/form-data");
            response.setHeader("Content-Disposition", "attachment;filename=尘负荷监测报告.docx");
            ServletOutputStream outputStream = response.getOutputStream();
            outputStream.write(bytes);
            outputStream.flush();
            outputStream.close();*/
        } catch (IOException e) {
            log.error ("导出失败,请联系网站管理员!", e);
        } catch (Exception e) {
            throw new RuntimeException(e);
        }finally {
            compile.close();
            inputStream.close();
        }
    }
screen-api/src/main/java/com/moral/api/mapper/OrganizationMapper.java
@@ -2,6 +2,9 @@
import com.moral.api.entity.Organization;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
 * <p>
@@ -13,4 +16,7 @@
 */
public interface OrganizationMapper extends BaseMapper<Organization> {
    List<Integer> orgIdList(@Param("organizationId") Integer organizationId);
    List<Integer> orgIdSpecialDevList(@Param("organizationId") Integer organizationId,@Param("mac") String mac);
}
screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
@@ -1,7 +1,10 @@
package com.moral.api.service.impl;
import com.moral.api.exception.BusinessException;
import com.moral.api.mapper.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.system.ApplicationHome;
import org.springframework.stereotype.Service;
@@ -36,10 +39,6 @@
import com.moral.api.entity.Dustld;
import com.moral.api.entity.ManageCoordinate;
import com.moral.api.entity.MaxRoad;
import com.moral.api.mapper.DustldMapper;
import com.moral.api.mapper.HistorySecondCruiserMapper;
import com.moral.api.mapper.ManageCoordinateMapper;
import com.moral.api.mapper.MaxRoadMapper;
import com.moral.api.pojo.dto.historySecondCruiser.DustldDTO;
import com.moral.api.pojo.dust.DustForm;
import com.moral.api.pojo.dust.TimeForm;
@@ -270,6 +269,8 @@
    private ManageCoordinateMapper manageCoordinateMapper;
    @Autowired
    private MaxRoadMapper maxRoadMapper;
    @Autowired
    private OrganizationMapper organizationMapper;
    @Override
    @Transactional
@@ -278,6 +279,11 @@
        Map<String, Object> userInfo = (Map<String, Object>) TokenUtils.getUserInfo();
        Map<String, Object> orgInfo = (Map<String, Object>) userInfo.get("organization");
        Integer orgId = (Integer) orgInfo.get("id");
        String mac = params.get("mac").toString();
        List<Integer> orgList = organizationMapper.orgIdSpecialDevList(orgId,mac);
        if(CollectionUtils.isEmpty(orgList)){
            throw new BusinessException("该设备没有路段组织信息!");
        }
        String time1 = params.get("startTime").toString();
        String dateString1 = DateUtils.stringToDateString(time1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN, DateUtils.yyyy_MM_dd_HH_mm_CN);
        String rsTime1 = dateString1.substring(5, 14);
@@ -286,7 +292,7 @@
        String rsTime2 = dateString2.substring(5, 14);
        HashMap<String, Object> rsMap = new HashMap<>();
        List<Map<String, Object>> dusts = historySecondCruiserMapper.getDusts(params);
        Map<String, List<DustldDTO>> collect = manageCoordinateMapper.CompareTo(orgId).stream().collect(Collectors.groupingBy(o -> o.getName()));
        Map<String, List<DustldDTO>> collect = manageCoordinateMapper.CompareTo(orgList.get(0)).stream().collect(Collectors.groupingBy(o -> o.getName()));
        if (ObjectUtils.isEmpty(dusts) || ObjectUtils.isEmpty(collect)){
            return null;
        }
screen-api/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java
@@ -210,7 +210,7 @@
                    });
                }
            }else {
                BigDecimal dataValue = Objects.nonNull(list.getDataValue())?BigDecimal.valueOf(Integer.parseInt(list.getDataValue())):BigDecimal.ZERO;
                BigDecimal dataValue = Objects.nonNull(list.getDataValue())?BigDecimal.valueOf(Double.parseDouble(list.getDataValue())):BigDecimal.ZERO;
                result.forEach(it->{
                    it.setAvgNum(it.getAvgNum().add(dataValue));
                });
@@ -224,8 +224,8 @@
    private BigDecimal numAvg(List<String> list , BigDecimal num){
        int nums = 1;
        for (int i=0;i<list.size();i=i+2){
            if(num.compareTo(BigDecimal.valueOf(Integer.parseInt(list.get(i))))>= 0 ){
                return num.add(BigDecimal.valueOf(Integer.parseInt(list.get(nums))));
            if(num.compareTo(BigDecimal.valueOf(Double.parseDouble(list.get(i))))>= 0 ){
                return num.add(BigDecimal.valueOf(Double.parseDouble(list.get(i+1))));
            }
            nums+=2;
        }
screen-api/src/main/resources/mapper/OrganizationMapper.xml
@@ -26,4 +26,39 @@
        <result column="is_delete" property="isDelete"/>
    </resultMap>
    <select id="orgIdList" resultType="java.lang.Integer">
        SELECT id FROM (
                           SELECT id, parent_id, name FROM organization  WHERE id = #{organizationId}
                           UNION ALL
                           SELECT i.id, i.parent_id, i.name
                           FROM organization  i
                                    INNER JOIN (
                               SELECT * FROM (
                                                 SELECT id, parent_id, name FROM organization  WHERE id = #{organizationId}
                                                 UNION ALL
                                                 SELECT id, parent_id, name FROM organization WHERE parent_id = #{organizationId}
                                             ) t1
                           ) t2 ON i.parent_id = t2.id
                           where i.is_delete = 0
                       ) t3
    </select>
    <select id="orgIdSpecialDevList" resultType="java.lang.Integer">
        select organization_id from special_device where organization_id in (
        SELECT id FROM (
                           SELECT id, parent_id, name FROM organization  WHERE id = #{organizationId}
                           UNION ALL
                           SELECT i.id, i.parent_id, i.name
                           FROM organization  i
                                    INNER JOIN (
                               SELECT * FROM (
                                                 SELECT id, parent_id, name FROM organization  WHERE id = #{organizationId}
                                                 UNION ALL
                                                 SELECT id, parent_id, name FROM organization WHERE parent_id = #{organizationId}
                                             ) t1
                           ) t2 ON i.parent_id = t2.id
                           where i.is_delete = 0
                       ) t3 ) and mac = #{mac} and is_delete = 0
    </select>
</mapper>
screen-api/src/main/resources/word/???????.docx
Binary files differ
screen-manage/src/main/java/com/moral/api/service/impl/SysDictDataServiceImpl.java
@@ -219,6 +219,7 @@
            QueryWrapper<SysDictData> wrapper = new QueryWrapper<>();
            wrapper.eq("is_delete", Constants.NOT_DELETE);
            wrapper.eq("dict_type_id", type.getId());
            wrapper.orderByAsc("id");
            List<SysDictData> datas = sysDictDataMapper.selectList(wrapper);
            result.put(type.getName(), datas);
        }
screen-manage/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
@@ -202,6 +202,7 @@
    private List<SysDictType> getAllDictTypeFromDB() {
        QueryWrapper<SysDictType> wrapper = new QueryWrapper<>();
        wrapper.eq("is_delete", Constants.NOT_DELETE);
        wrapper.orderByAsc("id");
        List<SysDictType> sysDictTypes = sysDictTypeMapper.selectList(wrapper);
        return sysDictTypes;
    }