diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/AddServiceController.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/AddServiceController.java index e0045c7..d8622fb 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/AddServiceController.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/AddServiceController.java @@ -9,7 +9,6 @@ import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.domain.AddService; -import com.muyu.many.domain.MessageData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/EnterpriseController.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/EnterpriseController.java index 860796e..87bd06c 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/EnterpriseController.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/controller/EnterpriseController.java @@ -5,7 +5,7 @@ import javax.servlet.http.HttpServletResponse; import com.muyu.authentication.service.IEnterpriseService; import com.muyu.domain.vo.EnterpriseReq; -import com.muyu.many.domain.MessageData; +import com.muyu.many.domain.Message.MessageData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import com.muyu.common.log.annotation.Log; diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IAddServiceService.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IAddServiceService.java index c7caa4e..fdfefec 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IAddServiceService.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IAddServiceService.java @@ -1,7 +1,6 @@ package com.muyu.authentication.service; import com.muyu.domain.AddService; -import com.muyu.many.domain.MessageData; import java.util.List; diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IEnterpriseService.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IEnterpriseService.java index 0ab6297..bcb44d6 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IEnterpriseService.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/IEnterpriseService.java @@ -5,7 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.Enterprise; import com.muyu.domain.vo.EnterpriseReq; -import com.muyu.many.domain.MessageData; +import com.muyu.many.domain.Message.MessageData; /** * 企业Service接口 diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/AddServiceServiceImpl.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/AddServiceServiceImpl.java index 6f7e946..ad5bd77 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/AddServiceServiceImpl.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/AddServiceServiceImpl.java @@ -1,11 +1,9 @@ package com.muyu.authentication.service.impl; -import com.alibaba.fastjson.JSON; import com.muyu.authentication.mapper.AddServiceMapper; import com.muyu.authentication.service.IAddServiceService; import com.muyu.common.core.utils.DateUtils; import com.muyu.domain.AddService; -import com.muyu.many.domain.MessageData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; diff --git a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java index 8cfc6b3..f5842c5 100644 --- a/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java +++ b/muyu-modules/muyu-company/muyu-company-server/src/main/java/com/muyu/authentication/service/impl/EnterpriseServiceImpl.java @@ -18,11 +18,10 @@ import com.muyu.common.core.utils.DateUtils; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.RemoteUserService; import com.muyu.domain.vo.EnterpriseReq; -import com.muyu.many.domain.MessageData; +import com.muyu.many.domain.Message.MessageData; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Bean; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import com.muyu.domain.Enterprise; @@ -244,7 +243,7 @@ public class EnterpriseServiceImpl extends ServiceImpl> list(DefectInfoQueryReq defectInfoQueryReq) { + startPage(); + List list = defectInfoService.list(DefectInfo.queryBuild(defectInfoQueryReq)); + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + return getDataTable(list); + } + + /** + * 导出故障码列表 + */ + @ApiOperation("导出故障码列表") + @Log(title = "故障码", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, DefectInfo defectInfo) { + List list = defectInfoService.list(defectInfo); + ExcelUtil util = new ExcelUtil(DefectInfo.class); + util.exportExcel(response, list, "故障码数据"); + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + } + + /** + * 获取故障码详细信息 + */ + @ApiOperation("获取故障码详细信息") + @GetMapping(value = "/{id}") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getInfo(@PathVariable("id") Long id) { + DefectInfo byId = defectInfoService.getById(id); + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + return Result.success(byId); + } + + /** + * 新增故障码 + */ + @Log(title = "故障码", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增故障码") + public Result add(@RequestBody DefectInfoSaveReq defectInfoSaveReq) { + boolean save = defectInfoService.save(DefectInfo.saveBuild(defectInfoSaveReq)); + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + return toAjax(save); + } + + /** + * 修改故障码 + */ + @Log(title = "故障码", businessType = BusinessType.UPDATE) + @PutMapping("/{id}") + @ApiOperation("修改故障码") + public Result edit(@PathVariable Long id, @RequestBody DefectInfoEditReq defectInfoEditReq) { + boolean b = defectInfoService.updateById(DefectInfo.editBuild(id, defectInfoEditReq)); + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + return toAjax(b); + } + + /** + * 删除故障码 + */ + @Log(title = "故障码", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + @ApiOperation("删除故障码") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable List ids) { + boolean b = defectInfoService.removeBatchByIds(ids); + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + return toAjax(b); + } +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/FaultInfoController.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/FaultInfoController.java new file mode 100644 index 0000000..e6b10f6 --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/FaultInfoController.java @@ -0,0 +1,116 @@ +package com.muyu.authentication.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.muyu.authentication.service.FaultInfoService; +import com.muyu.clw.common.many.datasource.holder.DynamicDataSourceHolder; +import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.many.domain.FaultInfo; +import com.muyu.many.domain.req.FaultInfoEditReq; +import com.muyu.many.domain.req.FaultInfoQueryReq; +import com.muyu.many.domain.req.FaultInfoSaveReq; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; + +/** + * 故障记录Controller + * + * @author wan + * @date 2024-06-20 + */ +@Api(tags = "故障记录") +@RestController +@RequestMapping("/fault") +public class FaultInfoController extends BaseController { + @Autowired + private FaultInfoService faultInfoService; + + /** + * 查询故障记录列表 + */ + @ApiOperation("获取故障记录列表") + @GetMapping("/list") + public Result> list(FaultInfoQueryReq faultInfoQueryReq) { + startPage(); + List list = faultInfoService.list(FaultInfo.queryBuild(faultInfoQueryReq)); + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + return getDataTable(list); + } + + /** + * 导出故障记录列表 + */ + @ApiOperation("导出故障记录列表") + @Log(title = "故障记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, FaultInfo faultInfo) { + List list = faultInfoService.list(faultInfo); + ExcelUtil util = new ExcelUtil(FaultInfo.class); + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + util.exportExcel(response, list, "故障记录数据"); + } + + /** + * 获取故障记录详细信息 + */ + @ApiOperation("获取故障记录详细信息") + @GetMapping(value = "/{id}") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) + public Result getInfo(@PathVariable("id") Long id) { + FaultInfo byId = faultInfoService.getById(id); + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + return Result.success(byId); + } + + /** + * 新增故障记录 + */ + @Log(title = "故障记录", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增故障记录") + public Result add(@RequestBody FaultInfoSaveReq faultInfoSaveReq) { + boolean save = faultInfoService.save(FaultInfo.saveBuild(faultInfoSaveReq)); + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + return toAjax(save); + } + + /** + * 修改故障记录 + */ + @Log(title = "故障记录", businessType = BusinessType.UPDATE) + @PutMapping("/{id}") + @ApiOperation("修改故障记录") + public Result edit(@PathVariable Long id, @RequestBody FaultInfoEditReq faultInfoEditReq) { + boolean b = faultInfoService.updateById(FaultInfo.editBuild(id, faultInfoEditReq)); + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + return toAjax(b); + } + + /** + * 删除故障记录 + */ + @Log(title = "故障记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + @ApiOperation("删除故障记录") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable List ids) { + boolean b = faultInfoService.removeBatchByIds(ids); + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + return toAjax(b); + } +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/FenceController.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/FenceController.java index 21d3f59..49d6043 100644 --- a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/FenceController.java +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/controller/FenceController.java @@ -8,12 +8,10 @@ import com.muyu.clw.common.many.datasource.holder.DynamicDataSourceHolder; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.many.domain.Fence; -import com.muyu.many.domain.MessageData; import com.muyu.many.domain.req.FenceEditReq; import com.muyu.many.domain.req.FenceQueryReq; import com.muyu.many.domain.req.FenceSaveReq; import com.muyu.many.domain.vo.FenceReq; -import com.muyu.many.domain.vo.Locations; import io.swagger.annotations.*; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/mapper/DefectInfoMapper.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/mapper/DefectInfoMapper.java new file mode 100644 index 0000000..f96a218 --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/mapper/DefectInfoMapper.java @@ -0,0 +1,16 @@ +package com.muyu.authentication.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.many.domain.DefectInfo; + + +/** + * 故障码Mapper接口 + * + * @author wan + * @date 2024-06-20 + */ +public interface DefectInfoMapper extends BaseMapper { + +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/mapper/FaultInfoMapper.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/mapper/FaultInfoMapper.java new file mode 100644 index 0000000..5534172 --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/mapper/FaultInfoMapper.java @@ -0,0 +1,15 @@ +package com.muyu.authentication.mapper; + +import java.util.List; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.many.domain.FaultInfo; + +/** + * 故障记录Mapper接口 + * + * @author wan + * @date 2024-06-20 + */ +public interface FaultInfoMapper extends BaseMapper { + +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/rabbitmq/vo/BreakdownAbnormalMq.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/rabbitmq/vo/BreakdownAbnormalMq.java new file mode 100644 index 0000000..3b3f44f --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/rabbitmq/vo/BreakdownAbnormalMq.java @@ -0,0 +1,44 @@ +package com.muyu.authentication.rabbitmq.vo; + +import com.alibaba.fastjson.JSON; +import com.muyu.many.domain.Enterprise; +import com.muyu.many.domain.FaultInfo; +import lombok.extern.log4j.Log4j2; +import org.springframework.amqp.rabbit.annotation.RabbitListener; +import org.springframework.stereotype.Component; + +/** + * 接收故障信息 + * + * @ClassName BreakdownAbnormalMq + * @Author AnNan.Wang + * @Date 2024/6/20 16:00 + */ + +@Log4j2 +@Component +public class BreakdownAbnormalMq { + + + @RabbitListener(queues = "discover_time") + public void discoverTime(String message){ + log.info("开始消费"); + //转换 + FaultInfo faultInfo = JSON.parseObject(message, FaultInfo.class); + +// redis +// VIN +// ent_???? + + log.info("消费结束"); + } + + + @RabbitListener(queues = "resolve_time") + public void resolveTime(String message){ + log.info("开始消费"); + FaultInfo parse = JSON.parseObject(message, FaultInfo.class); + + log.info("消费结束"); + } +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/redisCache/RedisCache.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/redisCache/RedisCache.java new file mode 100644 index 0000000..50aa457 --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/redisCache/RedisCache.java @@ -0,0 +1,55 @@ +package com.muyu.authentication.redisCache; + +import com.muyu.authentication.mapper.VehicleMapper; +import com.muyu.authentication.redisCache.vo.CacheList; +import com.muyu.clw.common.many.datasource.holder.DynamicDataSourceHolder; +import com.muyu.clw.common.many.remote.RemoteEnterpriseService; +import com.muyu.common.core.domain.Result; +import com.muyu.domain.Enterprise; +import com.muyu.many.domain.Vehicle; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; + +/** + * 每个企业的车辆 + * + * @ClassName RedisCache + * @Author AnNan.Wang + * @Date 2024/6/20 16:52 + */ + +@Log4j2 +@Component +public class RedisCache { + + @Autowired + private RemoteEnterpriseService remoteEnterpriseService; + @Autowired + private VehicleMapper vehicleMapper; + @Autowired + private StringRedisTemplate redisTemplate; + + @Scheduled(cron = "0/10 * * * * ?") + public void initialize(){ + Result> enterprised = remoteEnterpriseService.enterpriseAllList(); + List data = enterprised.getData(); + + for (Enterprise datum : data) { + String many="ent_"+datum.getContactPhone().substring(datum.getContactPhone().length()-4); + DynamicDataSourceHolder.setDynamicDataSourceKey(many); + List vehicles = vehicleMapper.selectList(null); + for (Vehicle vehicle : vehicles) { + String key = vehicle.getVin()+"123"; + log.info("存入reids里,key:{},many:{}",key,many); + redisTemplate.opsForValue().set(key,many); + } + } + DynamicDataSourceHolder.removeDynamicDataSourceKey(); + } +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/redisCache/vo/CacheList.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/redisCache/vo/CacheList.java new file mode 100644 index 0000000..419aef1 --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/redisCache/vo/CacheList.java @@ -0,0 +1,23 @@ +package com.muyu.authentication.redisCache.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 缓存 + * + * @ClassName CacheList + * @Author AnNan.Wang + * @Date 2024/6/20 17:02 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class CacheList { + private String key; + private String entList; +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/DefectInfoService.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/DefectInfoService.java new file mode 100644 index 0000000..3e47b46 --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/DefectInfoService.java @@ -0,0 +1,22 @@ +package com.muyu.authentication.service; + +import java.util.List; +import com.muyu.many.domain.DefectInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 故障码Service接口 + * + * @author wan + * @date 2024-06-20 + */ +public interface DefectInfoService extends IService { + /** + * 查询故障码列表 + * + * @param defectInfo 故障码 + * @return 故障码集合 + */ + public List list(DefectInfo defectInfo); + +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/FaultInfoService.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/FaultInfoService.java new file mode 100644 index 0000000..1ed61ef --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/FaultInfoService.java @@ -0,0 +1,22 @@ +package com.muyu.authentication.service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.many.domain.FaultInfo; + +/** + * 故障记录Service接口 + * + * @author wan + * @date 2024-06-20 + */ +public interface FaultInfoService extends IService { + /** + * 查询故障记录列表 + * + * @param faultInfo 故障记录 + * @return 故障记录集合 + */ + public List list(FaultInfo faultInfo); + +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/FenceService.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/FenceService.java index bad934a..bb773f9 100644 --- a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/FenceService.java +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/FenceService.java @@ -3,9 +3,7 @@ package com.muyu.authentication.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.core.domain.Result; import com.muyu.many.domain.Fence; -import com.muyu.many.domain.MessageData; import com.muyu.many.domain.vo.FenceReq; -import com.muyu.many.domain.vo.Locations; import java.util.List; diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/DefectInfoServiceImpl.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/DefectInfoServiceImpl.java new file mode 100644 index 0000000..857677e --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/DefectInfoServiceImpl.java @@ -0,0 +1,57 @@ +package com.muyu.authentication.service.impl; + +import java.util.List; + +import com.muyu.authentication.mapper.DefectInfoMapper; +import com.muyu.authentication.service.DefectInfoService; +import com.muyu.common.core.utils.ObjUtils; +import com.muyu.many.domain.DefectInfo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 故障码Service业务层处理 + * + * @author wan + * @date 2024-06-20 + */ +@Slf4j +@Service +public class DefectInfoServiceImpl extends ServiceImpl implements DefectInfoService { + + /** + * 查询故障码列表 + * + * @param defectInfo 故障码 + * @return 故障码 + */ + @Override + public List list(DefectInfo defectInfo) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + + if (ObjUtils.notNull(defectInfo.getDefectCode())){ + queryWrapper.eq(DefectInfo::getDefectCode, defectInfo.getDefectCode()); + } + + if (ObjUtils.notNull(defectInfo.getAbortSituation())){ + queryWrapper.eq(DefectInfo::getAbortSituation, defectInfo.getAbortSituation()); + } + + if (ObjUtils.notNull(defectInfo.getDefectBit())){ + queryWrapper.eq(DefectInfo::getDefectBit, defectInfo.getDefectBit()); + } + + if (ObjUtils.notNull(defectInfo.getDefectValue())){ + queryWrapper.eq(DefectInfo::getDefectValue, defectInfo.getDefectValue()); + } + + + + + + return list(queryWrapper); + } +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/FaultInfoServiceImpl.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/FaultInfoServiceImpl.java new file mode 100644 index 0000000..44c47f9 --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/FaultInfoServiceImpl.java @@ -0,0 +1,62 @@ +package com.muyu.authentication.service.impl; + +import java.util.List; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.authentication.mapper.FaultInfoMapper; +import com.muyu.authentication.service.FaultInfoService; +import com.muyu.common.core.utils.ObjUtils; +import com.muyu.many.domain.FaultInfo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 故障记录Service业务层处理 + * + * @author wan + * @date 2024-06-20 + */ +@Slf4j +@Service +public class FaultInfoServiceImpl extends ServiceImpl implements FaultInfoService { + + /** + * 查询故障记录列表 + * + * @param faultInfo 故障记录 + * @return 故障记录 + */ + @Override + public List list(FaultInfo faultInfo) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + + if (ObjUtils.notNull(faultInfo.getFaultCode())){ + queryWrapper.eq(FaultInfo::getFaultCode, faultInfo.getFaultCode()); + } + + if (ObjUtils.notNull(faultInfo.getVin())){ + queryWrapper.eq(FaultInfo::getVin, faultInfo.getVin()); + } + + if (ObjUtils.notNull(faultInfo.getFailureLevel())){ + queryWrapper.eq(FaultInfo::getFailureLevel, faultInfo.getFailureLevel()); + } + + if (ObjUtils.notNull(faultInfo.getStartTime())){ + queryWrapper.eq(FaultInfo::getStartTime, faultInfo.getStartTime()); + } + + if (ObjUtils.notNull(faultInfo.getEndTime())){ + queryWrapper.eq(FaultInfo::getEndTime, faultInfo.getEndTime()); + } + + + + + + return list(queryWrapper); + } +} diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/FenceServiceImpl.java b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/FenceServiceImpl.java index c9f12ba..360f7b2 100644 --- a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/FenceServiceImpl.java +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/java/com/muyu/authentication/service/impl/FenceServiceImpl.java @@ -1,22 +1,14 @@ package com.muyu.authentication.service.impl; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.authentication.mapper.FenceMapper; import com.muyu.authentication.service.FenceService; -import com.muyu.clw.common.many.datasource.holder.DynamicDataSourceHolder; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.ObjUtils; import com.muyu.many.domain.Fence; -import com.muyu.many.domain.MessageData; import com.muyu.many.domain.vo.FenceReq; -import com.muyu.many.domain.vo.Locations; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.ListOperations; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import java.util.List; diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..03d6a99 --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1 @@ +{ "properties": [ ] } \ No newline at end of file diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/bootstrap.yml index e5fbdfc..4ec0c46 100644 --- a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/bootstrap.yml @@ -3,6 +3,9 @@ server: port: 9403 # Spring spring: + redis: + host: 101.34.243.166 + port: 6379 rabbitmq: username: guest password: guest @@ -12,8 +15,6 @@ spring: listener: simple: prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条 - publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) - publisher-returns: true #确 application: # 应用名称 name: ruoyi-many diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/mapper/DefectInfoMapper.xml b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/mapper/DefectInfoMapper.xml new file mode 100644 index 0000000..fe813dd --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/mapper/DefectInfoMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + select id, defect_code, abort_situation, defect_bit, defect_value, remark, create_by, create_time, update_by, update_time from defect_info + + diff --git a/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/mapper/FaultInfoMapper.xml b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/mapper/FaultInfoMapper.xml new file mode 100644 index 0000000..d22e0c2 --- /dev/null +++ b/muyu-modules/muyu-modules-many/muyu-modules-many-server/src/main/resources/mapper/FaultInfoMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + select id, fault_code, vin, failure_level, start_time, end_time, remark, create_by, create_time, update_by, update_time from fault_info + +