Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

zmk

2024-05-18 306749fa2e6ea7609468889cb56473770d0a26cc

Merge branch 'master' of ssh://117.78.1.188:29418/dkyChenJiang

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/DeviceLogController.java

@@ -6,6 +6,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import com.javaweb.common.annotation.Log;
import com.javaweb.common.enums.BusinessType;
@@ -68,7 +69,16 @@
     */
    @GetMapping("/add")
    public String add(String projectId, ModelMap mmap) {
        Integer number = deviceLogService.selectMaxDeviceLogId(projectId);
        if (ObjectUtils.isEmpty(number)){
            number = 1;
        }else {
            number++;
        }
        String formattedNumber = String.format("%06d", number);
        String code = "ZK" + formattedNumber;
        mmap.put("projectId", projectId);
        mmap.put("code", code);
        return prefix + "/add";
    }


 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/ProjectController.java

@@ -118,6 +118,7 @@
        project.setHoleNum(count);
        
        mmap.put("project", project);
        mmap.put("projectId", id);
        return prefix + "/info"; 
    }


 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java

@@ -17,7 +17,7 @@
    private static final long serialVersionUID = 1L;

    /** 主键 */
    private String id;
    private Integer id;

    /** 出入库单子号 */
    @Excel(name = "出入库单子号")
@@ -67,16 +67,15 @@
    /** 时间 */
    private Date createDate;

    public void setId(String id) 
    {
    public Integer getId() {
        return id;
    }

    public void setId(Integer id) {
        this.id = id;
    }

    public String getId() 
    {
        return id;
    }
    public void setCode(String code) 
    public void setCode(String code)
    {
        this.code = code;
    }

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/mapper/DeviceLogMapper.java

@@ -1,6 +1,8 @@
package com.javaweb.geo.mapper;

import com.javaweb.geo.domain.DeviceLog;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
@@ -58,4 +60,10 @@
     * @return 结果
     */
    public int deleteDeviceLogByIds(String[] ids);

    /**
     * 查询数据库中id最大值
     * @return
     */
    Integer selectMaxDeviceLogId(@Param("projectId") String projectId);
}

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/IDeviceLogService.java

@@ -65,4 +65,10 @@
     * 导入设备出入库记录
     */
    String importDeviceLog(String projectId, MultipartFile file, boolean updateSupport);

    /**
     * 查询数据库中id最大值
     * @return
     */
    Integer selectMaxDeviceLogId(String projectId);
}

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/DeviceLogServiceImpl.java

@@ -70,9 +70,6 @@
     */
    @Override
    public int insertDeviceLog(DeviceLog deviceLog) {
        if(ObjectUtils.isEmpty(deviceLog.getId())){
            deviceLog.setId(IdGenerate.nextId());
        }
        deviceLog.setCreateDate(DateUtils.getNowDate());
        return deviceLogMapper.insertDeviceLog(deviceLog);
    }
@@ -118,6 +115,8 @@
    public String importDeviceLog(String projectId,MultipartFile file, boolean updateSupport) {
        // 关联项目信息
        Project project = projectService.selectProjectById(projectId);
        // 关联code
        Integer number = deviceLogMapper.selectMaxDeviceLogId(projectId);

        try {
            String dest = saveExcel(file);
@@ -127,6 +126,15 @@
                item.setProjectId(projectId);
                item.setProjectName(project.getFullName());

                // 转换number信息
                if (ObjectUtils.isEmpty(number)){
                    number = 1;
                }else {
                    number++;
                }
                String code = "ZK" + String.format("%06d", number);
                item.setCode(code);

                item.setCreateDate(DateUtils.getNowDate());
                insertDeviceLog(item);
            }
@@ -134,6 +142,19 @@
            return e.toString();
        }
        return "导入完毕" ;
    }


    /**
     * 查询数据库中id最大值
     * @return
     *
     * TRUNCATE TABLE js_device_log;
     * ALTER TABLE js_device_log AUTO_INCREMENT = 1;
     */
    @Override
    public Integer selectMaxDeviceLogId(String projectId) {
        return deviceLogMapper.selectMaxDeviceLogId(projectId);
    }

    private String saveExcel(MultipartFile file) {
@@ -154,7 +175,6 @@

    private List<DeviceLog> readData(String filepath) {
        ExcelReader reader = ExcelUtil.getReader(filepath, 0);
        reader.addHeaderAlias("出入库单子号", "code");
        reader.addHeaderAlias("设备名称", "deviceName");
        reader.addHeaderAlias("类型", "type");
        reader.addHeaderAlias("入库时间", "inboundDate");

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/service/impl/HoleServiceImpl.java

@@ -201,11 +201,12 @@
    private List<Hole> readData(String filepath) {
        ExcelReader reader = ExcelUtil.getReader(filepath, 0);
        reader.addHeaderAlias("钻孔编号", "code");
        reader.addHeaderAlias("孔口高程", "elevation");
        reader.addHeaderAlias("设计孔深", "depth");
        reader.addHeaderAlias("孔口高程(m)", "elevation");
        reader.addHeaderAlias("设计孔深(m)", "depth");
        reader.addHeaderAlias("钻孔经度", "longitude");
        reader.addHeaderAlias("钻孔纬度", "latitude");
        reader.addHeaderAlias("进度", "pic1");
        reader.addHeaderAlias("总进尺(m)", "footage");
        reader.addHeaderAlias("已完成进尺(m)", "footageCpl");

        List<Hole> list = reader.readAll(Hole.class);
        return list;

 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/utils/ExceptionTimeUtils.java

@@ -66,9 +66,13 @@

        //2022-03-05 14:05:11    6.5

        Date date1 = DateUtils.parseDate("2022-03-05 13:43:03");
        Date date2 = DateUtils.parseDate("2022-03-05 14:05:11");
        Double spead = spead(date1,5.4d,date2,6.5d);
//        Date date1 = DateUtils.parseDate("2022-03-05 13:43:03");
//        Date date2 = DateUtils.parseDate("2022-03-05 14:05:11");
//        Double spead = spead(date1,5.4d,date2,6.5d);

        String s1 = "000019";
        int a = Integer.parseInt(s1) + 1;
        System.out.println(a);
    }
}


 javaweb-plus/javaweb-cms/src/main/resources/mapper/geo/DeviceLogMapper.xml

@@ -46,11 +46,14 @@
        <include refid="selectDeviceLogVo"/>
        where id = #{id}
    </select>
        

    <select id="selectMaxDeviceLogId" resultType="java.lang.Integer">
        SELECT MAX(id) FROM js_device_log where project_id = #{projectId}
    </select>

    <insert id="insertDeviceLog" parameterType="DeviceLog">
        insert into js_device_log
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="id != null  and id != ''">id,</if>
            <if test="code != null  and code != ''">code,</if>
            <if test="projectId != null  and projectId != ''">project_id,</if>
            <if test="projectName != null  and projectName != ''">project_name,</if>
@@ -67,7 +70,6 @@
            <if test="remark != null  and remark != ''">remark,</if>
         </trim>
        <trim prefix="values (" suffix=")" suffixOverrides=",">
            <if test="id != null  and id != ''">#{id},</if>
            <if test="code != null  and code != ''">#{code},</if>
            <if test="projectId != null  and projectId != ''">#{projectId},</if>
            <if test="projectName != null  and projectName != ''">#{projectName},</if>

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/add.html

@@ -9,7 +9,7 @@
            <div class="form-group">    
                <label class="col-sm-3 control-label">出入库单子号：</label>
                <div class="col-sm-8">
                    <input name="code" class="form-control" type="text">
                    <input name="code" th:value="${code}"  class="form-control" type="text" disabled="disabled">
                </div>
            </div>
            <div class="form-group">
@@ -68,6 +68,7 @@
    <script th:inline="javascript">
        var prefix = ctx + "geo/deviceLog"
        var projectId = [[${projectId}]];
        var code = [[${code}]];

        $("#form-deviceLog-add").validate({
            focusCleanup: true
@@ -76,7 +77,7 @@
        function submitHandler() {
            if ($.validate.form()) {
                let formData = $('#form-deviceLog-add').serialize();
                let data = formData + "&projectId=" + projectId;
                let data = formData + "&projectId=" + projectId + "&code=" + code;
                $.operate.save(prefix + "/add", data);
            }
        }

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/deviceLog/edit.html

@@ -10,7 +10,7 @@
            <div class="form-group">    
                <label class="col-sm-3 control-label">出入库单子号：</label>
                <div class="col-sm-8">
                    <input name="code" th:field="*{code}" class="form-control" type="text">
                    <input name="code" th:field="*{code}" class="form-control" type="text" disabled="disabled">
                </div>
            </div>
            <div class="form-group">

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/hole/edit.html

@@ -15,13 +15,13 @@
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">孔口高程：</label>
                <label class="col-sm-3 control-label">孔口高程(m)：</label>
                <div class="col-sm-8">
                    <input name="elevation" th:field="*{elevation}" class="form-control" type="text">
                </div>
            </div>
            <div class="form-group">    
                <label class="col-sm-3 control-label">设计孔深：</label>
                <label class="col-sm-3 control-label">设计孔深(m)：</label>
                <div class="col-sm-8">
                    <input name="depth" th:field="*{depth}" class="form-control" type="text" >
                </div>

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/info.html

@@ -54,51 +54,128 @@
</head>
<body class="white-bg">
    <div id="container">
        <p class="project-name">
            <span class="name-label">场地名称：</span>
            <span class="name-val" th:text="${project.fullName}"></span>
        </p>
        <table class="basic-info">
            <tr>
                <td>建设单位：</td>
                <td colspan="3" th:text="${project.companyName}"></td>
                <td>劳务单位：</td>
                <td colspan="3" th:text="${project.laborUnit}"></td>
            </tr>
            <tr>
                <td>建设地点：</td>
                <td colspan="7" th:text="${project.address}"></td>
            </tr>
            <tr>
                <td>场地名称：</td>
                <td colspan="5" th:text="${project.fullName}"></td>
                <td>场地编号：</td>
                <td th:text="${project.code}"></td>
            </tr>
            <tr>
                <td>钻孔个数：</td>
                <td th:text="${project.holeNum}"></td>
                <td>开始时间：</td>
                <td th:text="${#dates.format(project.createTime,'yyyy-MM-dd')}"></td>
                <td>终止时间：</td>
                <td th:text="${#dates.format(project.endTime,'yyyy-MM-dd')}"></td>
                <td>负责人：</td>
                <td th:text="${project.leaderName}"></td>
            </tr>
        </table>
<!--        <div class="map-model">-->
<!--            <button onclick="map()" type="button">地图模式</button>-->
<!--        </div>-->

        <div class="row">
            <p class="project-name">
                <span class="name-label">场地名称：</span>
                <span class="name-val" th:text="${project.fullName}"></span>
            </p>
            <table class="basic-info">
                <tr>
                    <td>建设单位：</td>
                    <td colspan="3" th:text="${project.companyName}"></td>
                    <td>劳务单位：</td>
                    <td colspan="3" th:text="${project.laborUnit}"></td>
                </tr>
                <tr>
                    <td>建设地点：</td>
                    <td colspan="7" th:text="${project.address}"></td>
                </tr>
                <tr>
                    <td>场地名称：</td>
                    <td colspan="5" th:text="${project.fullName}"></td>
                    <td>场地编号：</td>
                    <td th:text="${project.code}"></td>
                </tr>
                <tr>
                    <td>钻孔个数：</td>
                    <td th:text="${project.holeNum}"></td>
                    <td>开始时间：</td>
                    <td th:text="${#dates.format(project.createTime,'yyyy-MM-dd')}"></td>
                    <td>终止时间：</td>
                    <td th:text="${#dates.format(project.endTime,'yyyy-MM-dd')}"></td>
                    <td>负责人：</td>
                    <td th:text="${project.leaderName}"></td>
                </tr>
            </table>
            <!--        <div class="map-model">-->
            <!--            <button onclick="map()" type="button">地图模式</button>-->
            <!--        </div>-->
        </div>

        <div class="row">
            <div class="col-sm-12 select-table table-striped">
                <table id="bootstrap-table"></table>
            </div>
        </div>
    </div>
    <th:block th:include="include :: footer" />
    <th:block th:include="include :: datetimepicker-js" />
   

   <script th:inline="javascript">
        var project =[[${project}]];
        var projectId=[[${projectId}]];
        var statusDatas = [[${@dict.getType('hole_status')}]];
        var prefix = ctx + "geo/hole";

        function map(){
           parent.$.modal.openTab("项目地图",ctx+"/geo/projectwork/map?id=" + project.ids);
       }
        $(function() {
            var options = {
                url: prefix + "/list?projectId=" + projectId,
                modalName: "钻孔",
                columns: [{
                    checkbox: true
                },
                    {
                        field : 'ids',
                        title : '主键',
                        visible: false
                    },
                    {
                        field : 'code',
                        title : '钻孔编号'
                    },
                    {
                        field : 'elevation',
                        title : '孔口高程（m）'
                    },
                    {
                        field : 'depth',
                        title : '设计孔深（m）'
                    },
                    {
                        field : 'longitude',
                        title : '钻孔经度',
                        visible: false
                    },
                    {
                        field : 'latitude',
                        title : '钻孔纬度',
                        visible: false
                    },
                    {
                        field : 'status',
                        title : '钻孔状态',
                        formatter: function(value, row, index) {
                            return $.table.selectDictLabel(statusDatas, value);
                        }
                    },
                    {
                        field : 'footage',
                        title : '总进尺（m）',
                    },
                    {
                        field : 'footageCpl',
                        title : '已完成进尺（m）',
                    },
                    {
                        field : 'rate',
                        title : '完成进度(%)',
                        formatter: function(value, row, index) {
                            if (row.rate !=null){
                                return (row.rate*100).toFixed(2) + "%";
                            }else{
                                return "0%";
                            }
                        }
                    }
                ]
            };
            $.table.init(options);
        });
        //
        // function map(){
        //    parent.$.modal.openTab("项目地图",ctx+"/geo/projectwork/map?id=" + project.ids);
        // }
    </script>
</body>
</html>

 javaweb-plus/javaweb-cms/src/main/resources/templates/geo/project/project.html

@@ -58,6 +58,7 @@
                removeUrl: prefix + "/remove",
                exportUrl: prefix + "/export",
                modalName: "场地",
                pageSize:50,
                columns: [{
                    checkbox: true
                },