夏文涛 vor 2 Jahren
Ursprung
Commit
1a509ddcef

+ 0 - 21
src/main/java/com/template/auto/controller/SmartPushConfigController.java

@@ -1,21 +0,0 @@
-package com.template.auto.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author ceshi
- * @since 2024-06-05
- */
-@RestController
-@RequestMapping("/auto/smart-push-config")
-public class SmartPushConfigController {
-
-}
-

+ 0 - 16
src/main/java/com/template/auto/mapper/SmartPushConfigMapper.java

@@ -1,16 +0,0 @@
-package com.template.auto.mapper;
-
-import com.template.auto.model.SmartPushConfig;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author ceshi
- * @since 2024-06-05
- */
-public interface SmartPushConfigMapper extends BaseMapper<SmartPushConfig> {
-
-}

+ 0 - 64
src/main/java/com/template/auto/model/SmartPushConfig.java

@@ -1,64 +0,0 @@
-package com.template.auto.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author ceshi
- * @since 2024-06-05
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="SmartPushConfig对象", description="")
-public class SmartPushConfig implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.UUID)
-    private Integer id;
-
-    @ApiModelProperty(value = "家长 1:推送,2:不推送")
-    private Integer parentsPush;
-
-    @ApiModelProperty(value = "班主任 1:推送,2:不推送")
-    private Integer chargeTeacherPush;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-    @ApiModelProperty(value = "创建人员")
-    @TableField(fill = FieldFill.INSERT)
-    private String createUser;
-
-    @ApiModelProperty(value = "更新人员")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateUser;
-
-    @ApiModelProperty(value = "逻辑删除 未删除:0;删除:1")
-    @TableField(fill = FieldFill.INSERT)
-    @TableLogic
-    private Integer deleted;
-
-
-}

+ 0 - 20
src/main/java/com/template/auto/service/impl/SmartPushConfigServiceImpl.java

@@ -1,20 +0,0 @@
-package com.template.auto.service.impl;
-
-import com.template.auto.model.SmartPushConfig;
-import com.template.auto.mapper.SmartPushConfigMapper;
-import com.template.auto.services.SmartPushConfigService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author ceshi
- * @since 2024-06-05
- */
-@Service
-public class SmartPushConfigServiceImpl extends ServiceImpl<SmartPushConfigMapper, SmartPushConfig> implements SmartPushConfigService {
-
-}

+ 0 - 16
src/main/java/com/template/auto/services/SmartPushConfigService.java

@@ -1,16 +0,0 @@
-package com.template.auto.services;
-
-import com.template.auto.model.SmartPushConfig;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author ceshi
- * @since 2024-06-05
- */
-public interface SmartPushConfigService extends IService<SmartPushConfig> {
-
-}

+ 2 - 2
src/main/resources/application-prod.yml

@@ -37,9 +37,9 @@ mybatis-plus:
   mapper-locations: classpath:/mapper/template/*.xml
   configuration:
     #开启sql打印
-  #  log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
     #    #关闭sql打印
-    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+#    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
   global-config:
     db-config:
       logic-delete-value: 1

+ 2 - 4
src/main/resources/mapper/template/WechatScanLoginMapper.xml

@@ -226,10 +226,8 @@
         select smd.id,sm.build_address,sm.address,smd.meter_power,sm.meter_no,smd.create_time from smart_meter_detail smd
         left join smart_meter sm on sm.deleted = 0 and sm.id = smd.meter_id
         where smd.deleted = 0
-        <where>
-            <if test="meterMonthData.date != null and meterMonthData.date != ''"> AND smd.create_time like concat(#{meterMonthData.date}, '%')</if>
-            <if test="meterMonthData.type != null and meterMonthData.type != ''"> AND smd.meter_type = #{meterMonthData.type}</if>
-        </where>
+        <if test="meterMonthData.date != null and meterMonthData.date != ''"> AND smd.create_time like concat(#{meterMonthData.date}, '%')</if>
+        <if test="meterMonthData.type != null and meterMonthData.type != ''"> AND smd.meter_type = #{meterMonthData.type}</if>
         order by smd.create_time desc
     </select>
 </mapper>