cmhi
/
dispose
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OCT 

REM:
1. 更新集团一键处置对象重命名不全问题
2. 合并2.0.8.2版本修改
3. 重命名集团一键处置设备类名
This commit is contained in:
HuangXin 2021-10-15 17:34:54 +08:00
parent 2182c442ca
commit 1802f9ba71
5 changed files with 595 additions and 589 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config/application-local.properties
View File

@ -4,12 +4,18 @@ server.tomcat.basedir=./basedir
# 多个项目放在nginx下同个端口，通过该配置区分
server.servlet.context-path=/dispose
# 配置数据源
spring.datasource.url=jdbc:mysql://10.88.77\
.65:33061/dispose_cl_huaweifirewall?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\
=convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true
#spring.datasource.url=jdbc:mysql://10.88.77\
# .65:33061/dispose_cl_huaweifirewall?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\
# =convertToNull&useUnicode=true&characterEncoding=utf8&allowMultiQueries=true
#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
#spring.datasource.username=root
#spring.datasource.password=h0K0_8u
spring.datasource.url=jdbc:mysql://172.21.48.75:3306/dispose_hx?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\
=convertToNull&useUnicode=true
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=root
spring.datasource.password=h0K0_8u
spring.datasource.password=BCcf6Dd7&8
#spring.datasource.url=jdbc:mysql://172.28.72.118:33061/dispose_hx_v21?serverTimezone=Asia/Shanghai&zeroDateTimeBehavior\
# =convertToNull&useUnicode=true

1156
src/main/java/com/dispose/ability/impl/PengXinAbilityImpl.java → src/main/java/com/dispose/ability/impl/CmhiAbilityImpl.java
View File

File diff suppressed because it is too large Load Diff

2
src/main/java/com/dispose/ability/impl/UpfAbilityImpl.java
View File

@ -28,7 +28,7 @@ import java.util.List;
* @author Nicole
*/
@Slf4j
public class UpfAbilityImpl extends PengXinAbilityImpl {
public class UpfAbilityImpl extends CmhiAbilityImpl {
/**
* The Restful interface.
*/

4
src/main/java/com/dispose/service/impl/DisposeAbilityRouterServiceImpl.java
View File

@ -6,7 +6,7 @@ import com.dispose.ability.impl.DpTechBypassAbilityImpl;
import com.dispose.ability.impl.HaoHanAbilityImpl;
import com.dispose.ability.impl.HuaWeiAbilityImpl;
import com.dispose.ability.impl.HuaWeiFireWallAbilityImpl;
import com.dispose.ability.impl.PengXinAbilityImpl;
import com.dispose.ability.impl.CmhiAbilityImpl;
import com.dispose.ability.impl.UpfAbilityImpl;
import com.dispose.ability.impl.VirtualAbilityImpl;
import com.dispose.common.DisposeCapacityType;
@ -167,7 +167,7 @@ public class DisposeAbilityRouterServiceImpl implements DisposeAbilityRouterServ
db = new HaoHanAbilityImpl();
break;
case CMHI_PLATFORM:
db = new PengXinAbilityImpl();
db = new CmhiAbilityImpl();
break;
case HUAWEI_PLATFORM:
db = new HuaWeiAbilityImpl();

8
src/main/resources/mappers/DeviceTask.xml
View File

@ -150,9 +150,9 @@
SELECT dt.*, dd.*
FROM device_task dt
LEFT JOIN dispose_device dd ON dt.deviceId = dd.id
WHERE dd.deviceType = ${@com.dispose.common.DisposeDeviceType@PENGXIN_PLATFORM.getValue()}
AND dt.devStatus != ${@com.pengxin.dispose.common.PengXinTaskStatus@TASK_FINISHED_USER.getValue()}
AND dt.devStatus != ${@com.pengxin.dispose.common.PengXinTaskStatus@TASK_FINISHED_TIME.getValue()}
AND dt.devStatus != ${@com.pengxin.dispose.common.PengXinTaskStatus@TASK_REVIEWED_FAILED.getValue()}
WHERE dd.deviceType = ${@com.dispose.common.DisposeDeviceType@CMHI_PLATFORM.getValue()}
AND dt.devStatus != ${@com.cmhi.dispose.common.CmhiDisposeTaskStatus@TASK_FINISHED_USER.getValue()}
AND dt.devStatus != ${@com.cmhi.dispose.common.CmhiDisposeTaskStatus@TASK_FINISHED_TIME.getValue()}
AND dt.devStatus != ${@com.cmhi.dispose.common.CmhiDisposeTaskStatus@TASK_REVIEWED_FAILED.getValue()}
</select>
</mapper>