five-groups
/
five-groups-couplet
4
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

fix: 代码丢失找回

server_five_liuyunhu
lijiayao 2024-04-06 10:28:19 +08:00
parent e5761fb11f
commit a5bf87099d
10 changed files with 68 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/SysTroubleController.java
View File

@ -36,13 +36,6 @@ public class SysTroubleController extends BaseController {
return Result.success(result);
}
/**
* 故障类型信息
*/
@GetMapping("/troubleTypeList")
public List<CoupletTroubleType> listType() {
return troubleService.selectTroubleListByType();
}
/**
* 故障等级信息

1
couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/FenceMapper.java
View File

@ -1,7 +1,6 @@
package com.couplet.business.server.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.couplet.common.domain.Fence;
import com.couplet.common.domain.request.FenceConfig;
import com.couplet.common.domain.request.FenceRequest;

14
couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/SysTroubleMapper.java
View File

@ -3,6 +3,7 @@ package com.couplet.business.server.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.couplet.common.domain.CoupletTroubleCode;
import com.couplet.common.domain.CoupletTroubleGrade;
import com.couplet.common.domain.CoupletTroubleType;
import com.couplet.common.domain.request.TroubleResp;
import org.apache.ibatis.annotations.Mapper;
@ -18,9 +19,18 @@ import java.util.List;
public interface SysTroubleMapper extends BaseMapper<CoupletTroubleCode> {
List<CoupletTroubleCode> selectTroubleList(TroubleResp troubleReq);
List<CoupletTroubleType> selectTroubleListByType();
List<CoupletTroubleGrade> selectTroubleListByGrade();
int insertMsgResq(CoupletTroubleCode coupletTroubleCode);
/**
* 新增故障码数据
* @param code
*/
void newFaultData(CoupletTroubleCode code);
void cleanTroubleCode();
// int addTrouble(TroubleAddReq troubleAddReq);
// int updateTrouble(TroubleUpdReq troubleUpdReq);
}

2
couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleDetectionMapper.java
View File

@ -9,5 +9,5 @@ import java.util.List;
public interface VehicleDetectionMapper {
List<Vehicle> detectionList();
List<Vehicle> findByVin(Integer vehicleId);
List<Vehicle> findByVin(String vehicleId);
}

3
couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/SysTroubleService.java
View File

@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.couplet.common.core.domain.PageResult;
import com.couplet.common.domain.CoupletTroubleCode;
import com.couplet.common.domain.CoupletTroubleGrade;
import com.couplet.common.domain.CoupletTroubleType;
import com.couplet.common.domain.request.TroubleResp;
import java.util.List;
@ -18,8 +17,6 @@ import java.util.List;
public interface SysTroubleService extends IService<CoupletTroubleCode> {
PageResult<CoupletTroubleCode> selectTroubleList(TroubleResp troubleReq);
List<CoupletTroubleType> selectTroubleListByType();
List<CoupletTroubleGrade> selectTroubleListByGrade();
/**

5
couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/SysTroubleServiceImpl.java
View File

@ -6,7 +6,6 @@ import com.couplet.business.server.service.SysTroubleService;
import com.couplet.common.core.domain.PageResult;
import com.couplet.common.domain.CoupletTroubleCode;
import com.couplet.common.domain.CoupletTroubleGrade;
import com.couplet.common.domain.CoupletTroubleType;
import com.couplet.common.domain.request.TroubleResp;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
@ -40,10 +39,6 @@ public class SysTroubleServiceImpl extends ServiceImpl<SysTroubleMapper, Couplet
return PageResult.toPageResult(info.getTotal(),troubleList);
}
@Override
public List<CoupletTroubleType> selectTroubleListByType() {
return sysTroubleMapper.selectTroubleListByType();
}
@Override
public List<CoupletTroubleGrade> selectTroubleListByGrade() {

1
couplet-modules/couplet-business/src/main/resources/mapper/business/FenAndLogoMapper.xml
View File

@ -14,6 +14,7 @@
<result property="updateTime" column="update_time" />
<result property="isDelete" column="is_delete" />
<result property="maintainerName" column="maintainer_name" />
<result property="fenceCondition" column="fence_condition" />
</resultMap>
<resultMap id="logoMap" type="com.couplet.common.domain.Logo">
<id property="logoId" column="logo_id"/>

12
couplet-modules/couplet-business/src/main/resources/mapper/business/FenceMapper.xml
View File

@ -14,6 +14,7 @@
<result property="updateTime" column="update_time" />
<result property="isDelete" column="is_delete" />
<result property="maintainerName" column="maintainer_name" />
<result property="fenceCondition" column="fence_condition" />
</resultMap>
<resultMap id="logoMap" type="com.couplet.common.domain.Logo">
<id property="logoId" column="logo_id"/>
@ -32,6 +33,7 @@
create_name,
maintainer_name,
alarm_status,
fence_condition,
l.logo_id,
GROUP_CONCAT(logo_name) as logoName
FROM couplet_fence_info f INNER JOIN couplet_fences_and_logo m on
@ -49,16 +51,17 @@
update_time,
create_name,
maintainer_name,
alarm_status
alarm_status,
fence_condition
FROM couplet_fence_info
</sql>
<insert id="insertFence" parameterType="com.couplet.common.domain.request.FenceRequest" keyProperty="fenceId"
useGeneratedKeys="true">
INSERT INTO `couplet-cloud`.`couplet_fence_info`
(`fence_name`, `fence_longitude_latitude`, `fence_description`, `is_delete`, `fence_state`, `create_time`,
`update_time`, `create_name`, `maintainer_name`, `alarm_status`)
`update_time`, `create_name`, `maintainer_name`, `alarm_status`,`fence_condition`)
VALUES
(#{fenceName}, null, #{fenceDescription}, 0, 0, now(), null, null, #{maintainerName}, 0)
(#{fenceName}, null, #{fenceDescription}, 0, 0, now(), null, null, #{maintainerName}, 0 ,0)
</insert>
@ -73,7 +76,8 @@
`fence_state` = #{fenceState},
`update_time` = now(),
`maintainer_name` = 'admin',
`alarm_status` = #{alarmStatus}
`alarm_status` = #{alarmStatus},
`fence_condition` = #{fenceCondition}
WHERE `fence_id` = #{fenceId}
</update>

32
couplet-modules/couplet-business/src/main/resources/mapper/business/SysTroubleMapper.xml
View File

@ -7,22 +7,26 @@
<resultMap type="com.couplet.common.domain.CoupletTroubleCode" id="SysTroubleResult">
<id property="troubleId" column="trouble_id"/>
<result property="troubleCode" column="trouble_code"/>
<result property="troubleVin" column="trouble_vin"/>
<result property="troubleValue" column="trouble_value"/>
<result property="troublePosition" column="trouble_position"/>
<result property="troubleTag" column="trouble_tag"/>
<result property="typeId" column="type_id"/>
<result property="gradeId" column="grade_id"/>
<result property="troubleType" column="trouble_type"/>
<result property="troubleStartTime" column="trouble_start_time"/>
<result property="troubleEndTime" column="trouble_end_time"/>
</resultMap>
<sql id="selectTroubleVo">
select * from couplet_trouble_code
select t.*,g.grade_name,y.type_name from couplet_trouble_code t
LEFT JOIN couplet_trouble_grade g on t.grade_id = g.grade_id
LEFT JOIN couplet_trouble_type y on t.type_id= y.type_id
</sql>
<update id="cleanTroubleCode">
truncate table couplet_trouble_code
</update>
<insert id="newFaultData">
INSERT INTO `couplet-cloud`.`couplet_trouble_code`
(`trouble_vin`, `trouble_tag`,
`trouble_start_time`)
VALUES
(#{troubleVin}, #{troubleTag}, #{troubleStartTime})
</insert>
<select id="selectTroubleList" parameterType="com.couplet.business.server.mapper.SysTroubleMapper" resultMap="SysTroubleResult">
<include refid="selectTroubleVo"/>
@ -35,17 +39,11 @@
</if>
</where>
</select>
<select id="selectTroubleListByType" resultType="com.couplet.common.domain.CoupletTroubleType">
select * from couplet_trouble_type
</select>
<select id="selectTroubleListByGrade" resultType="com.couplet.common.domain.CoupletTroubleGrade">
select * from couplet_trouble_grade
</select>
<insert id="insertMsgResq">
insert into couplet_trouble_code(
trouble_code,
trouble_vin,
trouble_position,trouble_value,trouble_tag,trouble_type,trouble_start_time,trouble_end_time)
values(#{troubleCode},#{troubleVin},#{troublePosition},#{troubleValue},#{troubleTag},#{troubleType},#{troubleStartTime},#{troubleEndTime})
</insert>
</mapper>

74
couplet-modules/couplet-business/src/main/resources/mapper/business/VehicleMapper.xml
View File

@ -6,57 +6,45 @@
<sql id="selectMiddleUserOrVehicle">
SELECT m.middle_id,
m.user_id,
m.vehicle_id,
m.del_flag,
v.vehicle_type,
v.motor_manufacturer,
v.battery_manufacturer,
v.motor_number,
v.battery_number,
v.vin,
v.vehicle_state,
t.vehicle_type_name
FROM `couplet_middle` m
LEFT JOIN couplet_vehicle v ON m.vehicle_id = v.vehicle_id
LEFT JOIN couplet_vehicle_type t ON v.vehicle_id = t.vehicle_type_id
SELECT
m.middle_id,
m.user_id,
m.vehicle_id,
m.del_flag,
v.vehicle_type,
v.motor_manufacturer,
v.battery_manufacturer,
v.motor_number,
v.battery_number,
v.vin,
v.vehicle_state,
t.vehicle_type_name
FROM
`couplet_middle` m
LEFT JOIN couplet_vehicle v ON m.vehicle_id = v.vehicle_id
LEFT JOIN couplet_vehicle_type t ON v.vehicle_id = t.vehicle_type_id
WHERE m.del_flag = 0
</sql>
<sql id="selectVehicle">
select v.vehicle_id,
v.motor_manufacturer,
v.battery_manufacturer,
v.motor_number,
v.battery_number,
v.vin,
v.vehicle_state,
t.vehicle_type_name
select
v.vehicle_id,
v.motor_manufacturer,
v.battery_manufacturer,
v.motor_number,
v.battery_number,
v.vin,
v.vehicle_state,
t.vehicle_type_name
from couplet_vehicle v
left join couplet_vehicle_type t on v.vehicle_type = t.vehicle_type_id
where v.isdelete = 0
</sql>
<insert id="addVehicle">
INSERT INTO `couplet-cloud`.`couplet_middle` (`user_id`, `vehicle_id`, `del_flag`) VALUES
<foreach collection="vehicleIds" item="singleVehicleId" separator=",">
(#{userId}, #{singleVehicleId}, 0)
<foreach collection="vehicleId" item="vehicleId" separator=",">
(#{userId}, #{vehicleId}, 0)
</foreach>
</insert>
<update id="onOrOutLineByVIN">
UPDATE `couplet-cloud`.`couplet_vehicle`
SET `vehicle_state` = #{status}
WHERE `vin` = #{vin};
</update>
<!-- <insert id="addVehicle" useGeneratedKeys="true" keyProperty="vehicleId">-->
<!-- INSERT INTO `couplet-cloud`.`couplet_middle` (`user_id`, `vehicle_id`, `del_flag`) VALUES-->
<!-- <foreach collection="vehicleId" item="vehicleId" separator=",">-->
<!-- (#{userId}, #{vehicleId}, 0)-->
<!-- </foreach>-->
<!-- </insert>-->
<delete id="deleteVehicle">
update couplet_middle
set del_flag = '2'
@ -65,9 +53,9 @@
<select id="UserUnderTheVehicleList" resultType="com.couplet.common.domain.Vehicle">
<include refid="selectMiddleUserOrVehicle"/>
<if test="userId!=null">
AND m.user_id = #{userId}
</if>
<if test="userId!=null">
AND m.user_id = #{userId}
</if>
</select>
<select id="vehicleAll" resultType="com.couplet.common.domain.Vehicle">
<include refid="selectVehicle"/>