接口调整

zengh

2021-04-15 d0f50b2dba2bd2e325a333325ba644391c308b15

接口调整

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/activation/controller/ActivationController.java

@@ -119,6 +119,15 @@
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "新增或修改", notes = "传入survey")
    public R submit(@Valid Activation activation) {
        //首先需判断票号是否存在

        //如存在，判断该票是否已激活

        //若已经激活，则返回已激活

        //未激活，进入激活流程


        return R.status(activationService.saveOrUpdate(activation));
    }


 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml

@@ -79,7 +79,7 @@
        LEFT JOIN (
        SELECT
        count( id ) AS jtype,
        deviceNumber
        deviceNumber as deviceN
        FROM
        sys_alarm
        WHERE
@@ -88,7 +88,7 @@
        OR jtype = 1
        GROUP BY
        deviceNumber
        ) alarm ON alarm.deviceNumber = equipment.deviceNumber
        ) alarm ON alarm.deviceN = equipment.deviceNumber
        where 1=1

        <if test="equipment.deviceName!=null">
@@ -148,7 +148,7 @@
        LEFT JOIN (
        SELECT
        count( id ) AS jtype,
        deviceNumber
        deviceNumber as deviceN
        FROM
        sys_alarm
        WHERE
@@ -157,7 +157,7 @@
        OR jtype = 1
        GROUP BY
        deviceNumber
        ) alarm ON alarm.deviceNumber = equipment.deviceNumber
        ) alarm ON alarm.deviceN = equipment.deviceNumber
        where 1=1

        <if test="equipment.deviceName!=null">
@@ -267,7 +267,7 @@
        LEFT JOIN (
        SELECT
        count( id ) AS jtype,
        deviceNumber
        deviceNumber as deviceN
        FROM
        sys_alarm
        WHERE
@@ -276,7 +276,7 @@
        OR jtype = 1
        GROUP BY
        deviceNumber
        ) alarm ON alarm.deviceNumber = equipment.deviceNumber
        ) alarm ON alarm.deviceN = equipment.deviceNumber
        WHERE
        1 =1