cjl
2023-07-12 08b52ba6e8930958456ed58a1d39805caa7fe014
Merge remote-tracking branch 'origin/qa' into dev
5 files modified
7 ■■■■ changed files
pom.xml 2 ●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/AqiController.java 1 ●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/controller/BulletinController.java 1 ●●●● patch | view | raw | blame | history
screen-common/src/main/java/com/moral/util/MybatisPLUSUtils.java 1 ●●●● patch | view | raw | blame | history
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java 2 ●●●●● patch | view | raw | blame | history
pom.xml
@@ -115,7 +115,7 @@
            <scope>test</scope>
        </dependency>
        <dependency>
            <groupId>com.google.code.kaptcha</groupId>
            <groupId>com.github.penggle</groupId>
            <artifactId>kaptcha</artifactId>
            <version>2.3.2</version>
        </dependency>
screen-api/src/main/java/com/moral/api/controller/AqiController.java
@@ -30,7 +30,6 @@
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
import com.moral.util.WebUtils;
import sun.security.util.Resources_sv;
@RestController
@RequestMapping("/aqi")
screen-api/src/main/java/com/moral/api/controller/BulletinController.java
@@ -5,7 +5,6 @@
import com.moral.api.config.properties.SpecialCitiesProperties;
import com.moral.api.service.CityAqiDailyService;
import com.moral.constant.ResultMessage;
import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.CrossOrigin;
screen-common/src/main/java/com/moral/util/MybatisPLUSUtils.java
@@ -6,7 +6,6 @@
import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
import com.baomidou.mybatisplus.core.conditions.segments.NormalSegmentList;
import com.moral.constant.SeparateTableType;
import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
import java.text.ParseException;
import java.text.SimpleDateFormat;
screen-manage/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -22,8 +22,6 @@
import com.moral.constant.RedisConstants;
import com.moral.util.ConvertUtils;
import com.moral.util.DateUtils;
import com.sun.javafx.collections.MappingChange;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;