gxwebsoft/mp-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复完成

Browse Source
This commit is contained in:
赵忠林
2025-07-24 01:30:34 +08:00
parent f986f3fbd8
commit bd4677c69c
18 changed files with 57 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gxwebsoft/cms/entity/CmsDesign.java
View File

@@ -35,6 +35,9 @@ public class CmsDesign implements Serializable {
@ApiModelProperty(value = "所属栏目ID")
private Integer categoryId;
@ApiModelProperty(value = "页面模型")
private String model;
@ApiModelProperty(value = "页面关键词")
private String keywords;

3
src/main/java/com/gxwebsoft/cms/mapper/xml/CmsDesignMapper.xml
View File

@@ -20,6 +20,9 @@
<if test="param.categoryId != null">
AND a.category_id = #{param.categoryId}
</if>
<if test="param.model != null">
AND a.model = #{param.model}
</if>
<if test="param.keywords != null">
AND a.keywords LIKE CONCAT('%', #{param.keywords}, '%')
</if>

3
src/main/java/com/gxwebsoft/cms/param/CmsDesignParam.java
View File

@@ -33,6 +33,9 @@ public class CmsDesignParam extends BaseParam {
@QueryField(type = QueryType.EQ)
private Integer categoryId;
@ApiModelProperty(value = "页面模型")
private String model;
@ApiModelProperty(value = "页面关键词")
private String keywords;

5
src/main/java/com/gxwebsoft/common/core/config/MqttProperties.java
View File

@@ -15,11 +15,6 @@ import org.springframework.stereotype.Component;
@ConfigurationProperties(prefix = "mqtt")
public class MqttProperties {
/**
* 是否启用MQTT服务
*/
private boolean enabled = true;
/**
* MQTT服务器地址
*/

6
src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java
View File

@@ -65,9 +65,9 @@ public class MybatisPlusConfig {
"sys_dictionary",
"sys_dictionary_data",
"apps_test_data",
"cms_lang",
"hjm_car",
"hjm_fence"
"cms_lang"
// "hjm_car",
// "hjm_fence"
// "cms_website"
// "sys_user"
// "cms_domain"

2
src/main/java/com/gxwebsoft/hjm/controller/MQTTClientDemo.java
View File

@@ -1,4 +1,4 @@
package com.shengwei.iot.common.utils.mqtt;
package com.gxwebsoft.hjm.controller;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;

6
src/main/java/com/gxwebsoft/hjm/service/MqttService.java
View File

@@ -38,12 +38,6 @@ public class MqttService {
@PostConstruct
public void init() {
try {
// 检查是否启用MQTT服务
if (!mqttProperties.isEnabled()) {
logger.info("MQTT服务已禁用，跳过初始化");
return;
}
logger.info("开始初始化MQTT服务...");
// 验证配置属性

2
src/main/java/com/gxwebsoft/hjm/task/PushHjmFenceOutController.java
View File

@@ -44,7 +44,7 @@ public class PushHjmFenceOutController extends BaseController {
* @Scheduled(fixedDelay = 2000, initialDelay = 2000)
* @Scheduled(cron = "0 0 9 * * ?")
*/
@Scheduled(cron = "0 0/10 * * * ?")
// @Scheduled(cron = "0 0/10 * * * ?")
public void index() {
final List<HjmCar> list = hjmCarService.list(new LambdaQueryWrapper<HjmCar>()
.eq(HjmCar::getStatus, 1)

2
src/main/java/com/gxwebsoft/house/service/impl/HouseInfoServiceImpl.java
View File

@@ -144,7 +144,7 @@ public class HouseInfoServiceImpl extends ServiceImpl<HouseInfoMapper, HouseInfo
priceText += "/月";
}
combiner.addTextElement(priceText, 26, 50, currentY)
.setColor(java.awt.Color.RED)
.setColor(Color.RED)
.setCenter(true);
currentY += lineHeight;
}

6
src/main/java/com/gxwebsoft/project/controller/ProjectController.java
View File

@@ -251,7 +251,7 @@ public class ProjectController extends BaseController {
@ApiOperation("统计信息")
@GetMapping("/count")
public ApiResult<Map<String, BigDecimal>> count() {
Map<String, java.math.BigDecimal> data = new HashMap<>();
Map<String, BigDecimal> data = new HashMap<>();
final User loginUser = getLoginUser();
if (loginUser == null) {
return fail("请先登录", null);
@@ -280,14 +280,14 @@ public class ProjectController extends BaseController {
// TODO 今年已收续费总额
java.math.BigDecimal yearTotalPrice = projectService.sumMoney(new LambdaQueryWrapper<Project>()
BigDecimal yearTotalPrice = projectService.sumMoney(new LambdaQueryWrapper<Project>()
.between(Project::getUpdateTime, startOfYear, endOfYear)
.eq(Project::getDeleted, 0)
);
data.put("yearTotalPrice", yearTotalPrice);
// TODO 去年已收续费总额
java.math.BigDecimal lastTotalPrice = projectService.sumMoney(new LambdaQueryWrapper<Project>()
BigDecimal lastTotalPrice = projectService.sumMoney(new LambdaQueryWrapper<Project>()
.between(Project::getUpdateTime, startOfLastYear, endOfLastYear)
.eq(Project::getDeleted, 0)
.eq(Project::getDeleted,0)

6
src/main/java/com/gxwebsoft/project/controller/ProjectRenewController.java
View File

@@ -173,7 +173,7 @@ public class ProjectRenewController extends BaseController {
@ApiOperation("统计信息")
@GetMapping("/data")
public ApiResult<Map<String, BigDecimal>> data(ProjectParam param) {
Map<String, java.math.BigDecimal> data = new HashMap<>();
Map<String, BigDecimal> data = new HashMap<>();
final User loginUser = getLoginUser();
if (loginUser == null) {
return fail("请先登录", null);
@@ -250,14 +250,14 @@ public class ProjectRenewController extends BaseController {
data.put("monthTotalPrice", monthTotalPrice);
// TODO 今年已收续费总额
java.math.BigDecimal yearTotalPrice = projectRenewService.sumMoney(new LambdaQueryWrapper<ProjectRenew>()
BigDecimal yearTotalPrice = projectRenewService.sumMoney(new LambdaQueryWrapper<ProjectRenew>()
.between(ProjectRenew::getCreateTime, startOfYear, endOfYear)
.eq(ProjectRenew::getDeleted, 0)
);
data.put("yearTotalPrice", yearTotalPrice);
// TODO 去年已收续费总额
java.math.BigDecimal lastTotalPrice = projectRenewService.sumMoney(new LambdaQueryWrapper<ProjectRenew>()
BigDecimal lastTotalPrice = projectRenewService.sumMoney(new LambdaQueryWrapper<ProjectRenew>()
.eq(ProjectRenew::getDeleted, 0)
.between(ProjectRenew::getEndTime, startOfLastYear, endOfLastYear));
// 去年已收续费总额

16
src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java
View File

@@ -22,7 +22,7 @@ import java.util.List;
* 收货地址控制器
*
* @author 科技小王子
* @since 2025-01-11 10:45:13
* @since 2025-07-22 23:06:40
*/
@Api(tags = "收货地址管理")
@RestController
@@ -31,6 +31,7 @@ public class ShopUserAddressController extends BaseController {
@Resource
private ShopUserAddressService shopUserAddressService;
@PreAuthorize("hasAuthority('shop:shopUserAddress:list')")
@ApiOperation("分页查询收货地址")
@GetMapping("/page")
public ApiResult<PageResult<ShopUserAddress>> page(ShopUserAddressParam param) {
@@ -38,6 +39,7 @@ public class ShopUserAddressController extends BaseController {
return success(shopUserAddressService.pageRel(param));
}
@PreAuthorize("hasAuthority('shop:shopUserAddress:list')")
@ApiOperation("查询全部收货地址")
@GetMapping()
public ApiResult<List<ShopUserAddress>> list(ShopUserAddressParam param) {
@@ -53,6 +55,8 @@ public class ShopUserAddressController extends BaseController {
return success(shopUserAddressService.getByIdRel(id));
}
@PreAuthorize("hasAuthority('shop:shopUserAddress:save')")
@OperationLog
@ApiOperation("添加收货地址")
@PostMapping()
public ApiResult<?> save(@RequestBody ShopUserAddress shopUserAddress) {
@@ -67,6 +71,8 @@ public class ShopUserAddressController extends BaseController {
return fail("添加失败");
}
@PreAuthorize("hasAuthority('shop:shopUserAddress:update')")
@OperationLog
@ApiOperation("修改收货地址")
@PutMapping()
public ApiResult<?> update(@RequestBody ShopUserAddress shopUserAddress) {
@@ -76,6 +82,8 @@ public class ShopUserAddressController extends BaseController {
return fail("修改失败");
}
@PreAuthorize("hasAuthority('shop:shopUserAddress:remove')")
@OperationLog
@ApiOperation("删除收货地址")
@DeleteMapping("/{id}")
public ApiResult<?> remove(@PathVariable("id") Integer id) {
@@ -85,6 +93,8 @@ public class ShopUserAddressController extends BaseController {
return fail("删除失败");
}
@PreAuthorize("hasAuthority('shop:shopUserAddress:save')")
@OperationLog
@ApiOperation("批量添加收货地址")
@PostMapping("/batch")
public ApiResult<?> saveBatch(@RequestBody List<ShopUserAddress> list) {
@@ -94,6 +104,8 @@ public class ShopUserAddressController extends BaseController {
return fail("添加失败");
}
@PreAuthorize("hasAuthority('shop:shopUserAddress:update')")
@OperationLog
@ApiOperation("批量修改收货地址")
@PutMapping("/batch")
public ApiResult<?> removeBatch(@RequestBody BatchParam<ShopUserAddress> batchParam) {
@@ -103,6 +115,8 @@ public class ShopUserAddressController extends BaseController {
return fail("修改失败");
}
@PreAuthorize("hasAuthority('shop:shopUserAddress:remove')")
@OperationLog
@ApiOperation("批量删除收货地址")
@DeleteMapping("/batch")
public ApiResult<?> removeBatch(@RequestBody List<Integer> ids) {

5
src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java
View File

@@ -2,8 +2,9 @@ package com.gxwebsoft.shop.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.util.Date;
import java.io.Serializable;
import java.util.Date;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -13,7 +14,7 @@ import lombok.EqualsAndHashCode;
* 收货地址
*
* @author 科技小王子
* @since 2025-01-11 10:45:13
* @since 2025-07-22 23:06:40
*/
@Data
@EqualsAndHashCode(callSuper = false)

2
src/main/java/com/gxwebsoft/shop/mapper/ShopUserAddressMapper.java
View File

@@ -12,7 +12,7 @@ import java.util.List;
* 收货地址Mapper
*
* @author 科技小王子
* @since 2025-01-11 10:45:13
* @since 2025-07-22 23:06:40
*/
public interface ShopUserAddressMapper extends BaseMapper<ShopUserAddress> {

1
src/main/java/com/gxwebsoft/shop/mapper/xml/ShopUserAddressMapper.xml
View File

@@ -60,6 +60,7 @@
</if>
<if test="param.keywords != null">
AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
OR a.phone = #{param.keywords}
)
</if>
</where>

2
src/main/java/com/gxwebsoft/shop/param/ShopUserAddressParam.java
View File

@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
* 收货地址查询参数
*
* @author 科技小王子
* @since 2025-01-11 10:45:13
* @since 2025-07-22 23:06:40
*/
@Data
@EqualsAndHashCode(callSuper = false)

2
src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java
View File

@@ -11,7 +11,7 @@ import java.util.List;
* 收货地址Service
*
* @author 科技小王子
* @since 2025-01-11 10:45:13
* @since 2025-07-22 23:06:40
*/
public interface ShopUserAddressService extends IService<ShopUserAddress> {

2
src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java
View File

@@ -15,7 +15,7 @@ import java.util.List;
* 收货地址Service实现
*
* @author 科技小王子
* @since 2025-01-11 10:45:13
* @since 2025-07-22 23:06:40
*/
@Service
public class ShopUserAddressServiceImpl extends ServiceImpl<ShopUserAddressMapper, ShopUserAddress> implements ShopUserAddressService {