功能完善

liuhaonan

2021-12-02 9fc2a66e7a246f7991ad88cfa9e059ed3138dd23

功能完善

 dao/pom.xml

@@ -19,6 +19,11 @@
            <groupId>com.sandu.ximon</groupId>
            <artifactId>sandu-common</artifactId>
        </dependency>
        <dependency>
            <groupId>com.h2database</groupId>
            <artifactId>h2</artifactId>
            <version>1.4.200</version>
        </dependency>
    </dependencies>

</project>

 dao/src/main/java/com/sandu/ximon/dao/domain/LampMission.java

@@ -17,8 +17,9 @@
    @TableId(type = IdType.AUTO)
    private Long id;

    private String userName;
    private Long userId;

    /*任务执行天数*/
    @TableField(typeHandler = JsonIntegerArrayTypeHandler.class)
    private Integer[] weeks;

@@ -26,18 +27,22 @@
    private Double initial;

    /** å¼€ç¯æ—¶é—´ */
    @JsonFormat(pattern = " HH:mm:ss")
   // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
    //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
    //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="HH:mm")
    private LocalDateTime onTime;


    /** å…³ç¯æ—¶é—´ */
    @JsonFormat(pattern = " HH:mm:ss")
   // @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
    //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
    //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="HH:mm")
    private LocalDateTime offTime;

    /**
     * äº®åº¦è°ƒèŠ‚
     */
    private List<LightAdjust> adjusts;
   // private List<LightAdjust> adjusts;


}

 dao/src/main/java/com/sandu/ximon/dao/domain/LightAdjust.java

@@ -14,7 +14,11 @@
    @TableId(type = IdType.AUTO)
    private Long id;

    @JsonFormat(pattern = " HH:mm:ss")
    private Long missionId;

    //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
    //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
    //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="HH:mm")
    private LocalDateTime adjustTime;

    private double luminance;

 dao/src/main/resources/mapper/LampMissionMapper.xml

@@ -5,11 +5,11 @@
<mapper namespace="com.sandu.ximon.dao.mapper.LampMissionMapper">
    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LampMission">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="userName" column="user_name" jdbcType="VARCHAR"/>
        <result property="userId" column="user_id" jdbcType="BIGINT"/>
        <result property="weeks" column="weeks" typeHandler="com.sandu.common.mybatis.JsonStringArrayTypeHandler"/>
        <result property="initial" column="initial" jdbcType="DOUBLE"/>
        <result property="onTime" column="on_time" jdbcType="TIMESTAMP"/>
        <result property="offTime" column="off_time" jdbcType="TIMESTAMP"/>
        <collection property="adjusts" resultMap="com.sandu.ximon.dao.mapper.LightAdjustMapper.BaseResultMap"/>
       <!-- <collection property="adjusts" resultMap="com.sandu.ximon.dao.mapper.LightAdjustMapper.BaseResultMap"/>-->
    </resultMap>
</mapper>

 dao/src/main/resources/mapper/LightAdjustMapper.xml

@@ -5,6 +5,7 @@
<mapper namespace="com.sandu.ximon.dao.mapper.LightAdjustMapper">
    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LightAdjust">
        <id property="id" column="id" jdbcType="BIGINT"/>
        <id property="missionId" column="mission_id" jdbcType="BIGINT"/>
        <result property="adjustTime" column="adjust_time" jdbcType="TIMESTAMP"/>
        <result property="luminance" column="luminance" jdbcType="DOUBLE"/>
    </resultMap>

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LampMissionController.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,39 @@
package com.sandu.ximon.admin.controller;

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.MissionParam;
import com.sandu.ximon.admin.service.LampMissionService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@RestController
@AllArgsConstructor
@RequestMapping("v1/lampMission")
public class LampMissionController {
    private final LampMissionService lampMissionService;

    @PostMapping("/add")
    public ResponseVO<Object> addMission(@RequestBody MissionParam missionParam){
        return ResponseUtil.success( lampMissionService.addLampMission(missionParam));
    }

    @GetMapping("/update/{id}")
    public ResponseVO<Object> updateMission(@PathVariable Long id, @RequestBody MissionParam missionParam){
        return ResponseUtil.success(lampMissionService.updateLampMission(id,missionParam));
    }

     @GetMapping("/delete/{id}")
    public ResponseVO<Object> deleteMission(@PathVariable Long id){
        return ResponseUtil.success(lampMissionService.deleteMission(id));
    }


    // @AnonymousAccess
    @PostMapping("/list")
    public ResponseVO<Object> listMission(){
        //List<LampPost> list = lampPostService.list();
        // return ResponseUtil.success(list);
        return ResponseUtil.success(lampMissionService.list());
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/MissionParam.java

@@ -6,11 +6,12 @@

import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.List;

@Data
public class MissionParam {
public class MissionParam implements Serializable {



@@ -24,13 +25,16 @@

    /** å¼€ç¯æ—¶é—´ */
    @NotNull
    @JsonFormat(pattern = " HH:mm:ss")
    //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
    //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
    private LocalDateTime onTime;


    /** å…³ç¯æ—¶é—´ */
    @NotNull
    @JsonFormat(pattern = " HH:mm:ss")
    //@JsonFormat(pattern = " HH:mm")
    //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
    //@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss,timezone = \"GMT+8")
    private LocalDateTime offTime;

    /**

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,9 @@
package com.sandu.ximon.admin.param;

import lombok.Data;

@Data
public class ReceiveParam {
    Long id;
    String name;
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampMissionService.java

@@ -17,22 +17,23 @@

    public boolean addLampMission(MissionParam MissionParam){
        LampMission lampMission=new LampMission();
        lampMission.setUserName(SecurityUtils.getUsername());
        lampMission.setId(SecurityUtils.getUserId());
        lampMission.setWeeks(MissionParam.getWeeks());
        lampMission.setInitial(MissionParam.getInitial());
        lampMission.setOffTime(MissionParam.getOffTime());
        lampMission.setOnTime(MissionParam.getOnTime());
        if(MissionParam.getAdjusts()!=null){
           // LightAdjust adjust=new LightAdjust();
           // adjust.setId(MissionParam.get);
           /* for (LightAdjust adjust:MissionParam.getAdjusts()
            //LightAdjust adjust=new LightAdjust();
           // adjust.setId(lampMission.getId());
            for (LightAdjust adjust:MissionParam.getAdjusts()
                 ) {
                LightAdjust lightAdjust=new LightAdjust();
                lightAdjust.setMissionId(lampMission.getId());
                lightAdjust.setAdjustTime(adjust.getAdjustTime());
                lightAdjust.setLuminance(adjust.getLuminance());
            }*/
            }

            lampMission.setAdjusts(MissionParam.getAdjusts());
           // lampMission.setAdjusts(MissionParam.getAdjusts());
        }
       return save(lampMission);

@@ -45,13 +46,13 @@
            throw new BusinessException("未找到该灯杆");
        }
        LampMission lampMission=new LampMission();
        lampMission.setUserName(SecurityUtils.getUsername());
        lampMission.setId(SecurityUtils.getUserId());
        lampMission.setWeeks(MissionParam.getWeeks());
        lampMission.setInitial(MissionParam.getInitial());
        lampMission.setOffTime(MissionParam.getOffTime());
        lampMission.setOnTime(MissionParam.getOnTime());
        if(MissionParam.getAdjusts()!=null){
            lampMission.setAdjusts(MissionParam.getAdjusts());
           // lampMission.setAdjusts(MissionParam.getAdjusts());
        }

        return  updateById(lampMission);